Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 643b9c0a authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: kgsl: Fix false timeout gpu faults"

parents 13ac7037 bbb0e90e

drivers/gpu/msm/adreno_dispatch.c

+1 −5
Original line number Diff line number Diff line 
/* Copyright (c) 2013-2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2017, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -2024,10 +2024,6 @@ static int adreno_dispatch_process_cmdqueue(struct adreno_device *adreno_dev, 
	if (adreno_cmdqueue_is_empty(cmdqueue))

		return count;



	/* Don't update the cmdqueue timeout if we are about to preempt out */

	if (!adreno_in_preempt_state(adreno_dev, ADRENO_PREEMPT_NONE))

		return count;



	/* Don't update the cmdqueue timeout if it isn't active */

	if (!cmdqueue_is_current(cmdqueue))

		return count;