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

Commit 251880f8 authored by Harshdeep Dhatt's avatar Harshdeep Dhatt
Browse files

msm: kgsl: Remove fault argument from target specific reset 



It is unused in the target specific reset sequences.

Change-Id: I1af60c19c03c7cf116ef3178f1cf501c18b92e74
Signed-off-by: default avatarHarshdeep Dhatt <hdhatt@codeaurora.org>
parent 8c7ac65b

drivers/gpu/msm/adreno.c

+1 −1
Original line number Diff line number Diff line
@@ -2319,7 +2319,7 @@ int adreno_reset(struct kgsl_device *device, int fault) 
	int i;



	if (gpudev->reset)

		return gpudev->reset(device, fault);

		return gpudev->reset(device);



	/*

	 * Try soft reset first Do not do soft reset for a IOMMU fault (because

drivers/gpu/msm/adreno.h

+1 −1
Original line number Diff line number Diff line
@@ -822,7 +822,7 @@ struct adreno_gpudev { 
	bool (*hw_isidle)(struct adreno_device *adreno_dev);

	const char *(*iommu_fault_block)(struct kgsl_device *device,

				unsigned int fsynr1);

	int (*reset)(struct kgsl_device *device, int fault);

	int (*reset)(struct kgsl_device *device);

	bool (*sptprac_is_on)(struct adreno_device *adreno_dev);

	unsigned int (*ccu_invalidate)(struct adreno_device *adreno_dev,

				unsigned int *cmds);

drivers/gpu/msm/adreno_a6xx.c

+1 −2
Original line number Diff line number Diff line
@@ -1093,13 +1093,12 @@ static int64_t a6xx_read_throttling_counters(struct adreno_device *adreno_dev) 
/**

 * a6xx_reset() - Helper function to reset the GPU

 * @device: Pointer to the KGSL device structure for the GPU

 * @fault: Type of fault. Needed to skip soft reset for MMU fault

 *

 * Try to reset the GPU to recover from a fault.  First, try to do a low latency

 * soft reset.  If the soft reset fails for some reason, then bring out the big

 * guns and toggle the footswitch.

 */

static int a6xx_reset(struct kgsl_device *device, int fault)

static int a6xx_reset(struct kgsl_device *device)

{

	struct adreno_device *adreno_dev = ADRENO_DEVICE(device);

	int ret;