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

Commit 443c3945 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: Avoid false GMU alarm due to preemption"

parents 91fb7f81 08973d40

drivers/gpu/msm/adreno_a6xx.c

+0 −2
Original line number Diff line number Diff line
@@ -1014,7 +1014,6 @@ static int timed_poll_check(struct kgsl_device *device, 
			return 0;

		/* Wait 100us to reduce unnecessary AHB bus traffic */

		udelay(100);

		cond_resched();

	} while (!time_after(jiffies, t));



	/* Double check one last time */
@@ -1780,7 +1779,6 @@ static int a6xx_wait_for_lowest_idle(struct adreno_device *adreno_dev) 


		/* Wait 100us to reduce unnecessary AHB bus traffic */

		udelay(100);

		cond_resched();

	}



	/* Check one last time */

drivers/gpu/msm/kgsl_hfi.h

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ enum hfi_f2h_qpri { 
	HFI_F2H_QPRI_DEBUG = 40,

};



#define HFI_RSP_TIMEOUT 500 /* msec */

#define HFI_RSP_TIMEOUT 5000 /* msec */

#define HFI_H2F_CMD_IRQ_MASK BIT(0)



enum hfi_msg_type {