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

Commit fd2b279c authored by Harshdeep Dhatt's avatar Harshdeep Dhatt
Browse files

Revert "msm: kgsl: Make sure RBBM_INT_0_STATUS is not transitory" 



This reverts commit e8046965.

The issue is fixed in GMU firmware and this SWA is no longer
required.

Change-Id: I4a61f3a0e8b7cfe735879988b32deb8e662225c0
Signed-off-by: default avatarHarshdeep Dhatt <hdhatt@codeaurora.org>
parent d8136467

drivers/gpu/msm/adreno.c

+0 −27
Original line number Diff line number Diff line
@@ -614,7 +614,6 @@ static irqreturn_t adreno_irq_handler(struct kgsl_device *device) 
	struct adreno_irq *irq_params = gpudev->irq;

	irqreturn_t ret = IRQ_NONE;

	unsigned int status = 0, fence = 0, fence_retries = 0, tmp, int_bit;

	unsigned int status_retries = 0;

	int i;



	atomic_inc(&adreno_dev->pending_irq_refcnt);
@@ -653,32 +652,6 @@ static irqreturn_t adreno_irq_handler(struct kgsl_device *device) 


	adreno_readreg(adreno_dev, ADRENO_REG_RBBM_INT_0_STATUS, &status);



	/*

	 * Read status again to make sure the bits aren't transitory.

	 * Transitory bits mean that they are spurious interrupts and are

	 * seen while preemption is on going. Empirical experiments have

	 * shown that the transitory bits are a timing thing and they

	 * go away in the small time window between two or three consecutive

	 * reads. If they don't go away, log the message and return.

	 */

	while (status_retries < STATUS_RETRY_MAX) {

		unsigned int new_status;



		adreno_readreg(adreno_dev, ADRENO_REG_RBBM_INT_0_STATUS,

			&new_status);



		if (status == new_status)

			break;



		status = new_status;

		status_retries++;

	}



	if (status_retries == STATUS_RETRY_MAX) {

		KGSL_DRV_CRIT_RATELIMIT(device, "STATUS bits are not stable\n");

			return ret;

	}



	/*

	 * Clear all the interrupt bits but ADRENO_INT_RBBM_AHB_ERROR. Because

	 * even if we clear it here, it will stay high until it is cleared

drivers/gpu/msm/adreno.h

+1 −4
Original line number Diff line number Diff line 
/* Copyright (c) 2008-2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2008-2018, 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
@@ -175,9 +175,6 @@ 
/* Number of times to poll the AHB fence in ISR */

#define FENCE_RETRY_MAX 100



/* Number of times to see if INT_0_STATUS changed or not */

#define STATUS_RETRY_MAX 3



/* One cannot wait forever for the core to idle, so set an upper limit to the

 * amount of time to wait for the core to go idle

 */