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

Commit bd4cbbad 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: Ensure the GMU does not go to sleep in ISR" into msm-4.9

parents efd06830 df7ba70a

drivers/gpu/msm/adreno.c

+15 −0
Original line number Diff line number Diff line
@@ -609,6 +609,14 @@ static irqreturn_t adreno_irq_handler(struct kgsl_device *device) 
	/* Ensure this increment is done before the IRQ status is updated */

	smp_mb__after_atomic();



	/*

	 * On A6xx, the GPU can power down once the INT_0_STATUS is read

	 * below. But there still might be some register reads required

	 * so force the GMU/GPU into KEEPALIVE mode until done with the ISR.

	 */

	if (gpudev->gpu_keepalive)

		gpudev->gpu_keepalive(adreno_dev, true);



	adreno_readreg(adreno_dev, ADRENO_REG_RBBM_INT_0_STATUS, &status);



	/*
@@ -647,6 +655,13 @@ static irqreturn_t adreno_irq_handler(struct kgsl_device *device) 
		adreno_writereg(adreno_dev, ADRENO_REG_RBBM_INT_CLEAR_CMD,

				int_bit);



	/* Turn off the KEEPALIVE vote from earlier unless hard fault set */

	if (gpudev->gpu_keepalive) {

		/* If hard fault, then let snapshot turn off the keepalive */

		if (!(adreno_gpu_fault(adreno_dev) & ADRENO_HARD_FAULT))

			gpudev->gpu_keepalive(adreno_dev, false);

	}



	/* Make sure the regwrites are done before the decrement */

	smp_mb__before_atomic();

	atomic_dec(&adreno_dev->pending_irq_refcnt);

drivers/gpu/msm/adreno.h

+2 −0
Original line number Diff line number Diff line
@@ -855,6 +855,8 @@ struct adreno_gpudev { 
				unsigned int clear_mask);

	void (*oob_clear)(struct adreno_device *adreno_dev,

				unsigned int clear_mask);

	void (*gpu_keepalive)(struct adreno_device *adreno_dev,

			bool state);

	int (*rpmh_gpu_pwrctrl)(struct adreno_device *, unsigned int ops,

				unsigned int arg1, unsigned int arg2);

	bool (*hw_isidle)(struct adreno_device *);

drivers/gpu/msm/adreno_a6xx.c

+13 −0
Original line number Diff line number Diff line
@@ -984,6 +984,18 @@ static inline void a6xx_oob_clear(struct adreno_device *adreno_dev, 
	trace_kgsl_gmu_oob_clear(clear_mask);

}



/*

 * a6xx_gpu_keepalive() - GMU reg write to request GPU stays on

 * @adreno_dev: Pointer to the adreno device that has the GMU

 * @state: State to set: true is ON, false is OFF

 */

static inline void a6xx_gpu_keepalive(struct adreno_device *adreno_dev,

		bool state)

{

	adreno_write_gmureg(adreno_dev,

			ADRENO_REG_GMU_PWR_COL_KEEPALIVE, state);

}



#define SPTPRAC_POWERON_CTRL_MASK	0x00778000

#define SPTPRAC_POWEROFF_CTRL_MASK	0x00778001

#define SPTPRAC_POWEROFF_STATUS_MASK	BIT(2)
@@ -2314,6 +2326,7 @@ struct adreno_gpudev adreno_a6xx_gpudev = { 
	.llc_enable_overrides = a6xx_llc_enable_overrides,

	.oob_set = a6xx_oob_set,

	.oob_clear = a6xx_oob_clear,

	.gpu_keepalive = a6xx_gpu_keepalive,

	.rpmh_gpu_pwrctrl = a6xx_rpmh_gpu_pwrctrl,

	.hw_isidle = a6xx_hw_isidle, /* Replaced by NULL if GMU is disabled */

	.wait_for_gmu_idle = a6xx_wait_for_gmu_idle,

drivers/gpu/msm/adreno_dispatch.c

+5 −0
Original line number Diff line number Diff line
@@ -2049,6 +2049,7 @@ static void do_header_and_snapshot(struct kgsl_device *device, 
static int dispatcher_do_fault(struct adreno_device *adreno_dev)

{

	struct kgsl_device *device = KGSL_DEVICE(adreno_dev);

	struct adreno_gpudev *gpudev = ADRENO_GPU_DEVICE(adreno_dev);

	struct adreno_dispatcher *dispatcher = &adreno_dev->dispatcher;

	struct adreno_dispatcher_drawqueue *dispatch_q = NULL, *dispatch_q_temp;

	struct adreno_ringbuffer *rb;
@@ -2148,6 +2149,10 @@ static int dispatcher_do_fault(struct adreno_device *adreno_dev) 


	do_header_and_snapshot(device, hung_rb, cmdobj);



	/* Turn off the KEEPALIVE vote from the ISR for hard fault */

	if (gpudev->gpu_keepalive && fault & ADRENO_HARD_FAULT)

		gpudev->gpu_keepalive(adreno_dev, false);



	/* Terminate the stalled transaction and resume the IOMMU */

	if (fault & ADRENO_IOMMU_PAGE_FAULT)

		kgsl_mmu_pagefault_resume(&device->mmu);