Merge "msm: kgsl: Do not clear dispatcher fault when adreno reset fails" (54cdfe9f) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/gpu/msm/adreno_dispatch.c

+4 −3

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0-only
		/*
		* Copyright (c) 2013-2019, The Linux Foundation. All rights reserved.
		* Copyright (c) 2013-2020, The Linux Foundation. All rights reserved.
		*/

		#include <linux/slab.h>
		@@ -2260,12 +2260,13 @@ static int dispatcher_do_fault(struct adreno_device *adreno_dev)
		ret = adreno_reset(device, fault);

		mutex_unlock(&device->mutex);
		/* if any other fault got in until reset then ignore */
		atomic_set(&dispatcher->fault, 0);

		/* If adreno_reset() fails then what hope do we have for the future? */
		BUG_ON(ret);

		/* if any other fault got in until reset then ignore */
		atomic_set(&dispatcher->fault, 0);

		/* recover all the dispatch_q's starting with the one that hung */
		if (dispatch_q)
		recover_dispatch_q(device, dispatch_q, fault, base);