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

Commit 9cbeb2dc authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: kgsl: Add handler for GPC interrupt on A6xx GPU"

parents 343e865c 68b10619

drivers/gpu/msm/adreno_a5xx.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -3318,11 +3318,11 @@ static void a5xx_gpmu_int_callback(struct adreno_device *adreno_dev, int bit) 
}

}





/*

/*

 * a5x_gpc_err_int_callback() - Isr for GPC error interrupts

 * a5xx_gpc_err_int_callback() - Isr for GPC error interrupts

 * @adreno_dev: Pointer to device

 * @adreno_dev: Pointer to device

 * @bit: Interrupt bit

 * @bit: Interrupt bit

 */

 */

void a5x_gpc_err_int_callback(struct adreno_device *adreno_dev, int bit)

static void a5xx_gpc_err_int_callback(struct adreno_device *adreno_dev, int bit)

{

{

	struct kgsl_device *device = KGSL_DEVICE(adreno_dev);

	struct kgsl_device *device = KGSL_DEVICE(adreno_dev);
@@ -3332,7 +3332,7 @@ void a5x_gpc_err_int_callback(struct adreno_device *adreno_dev, int bit) 
	 * with help of register dump.

	 * with help of register dump.

	 */

	 */





	KGSL_DRV_CRIT(device, "RBBM: GPC error\n");

	KGSL_DRV_CRIT_RATELIMIT(device, "RBBM: GPC error\n");

	adreno_irqctrl(adreno_dev, 0);

	adreno_irqctrl(adreno_dev, 0);





	/* Trigger a fault in the dispatcher - this will effect a restart */

	/* Trigger a fault in the dispatcher - this will effect a restart */
@@ -3370,7 +3370,7 @@ static struct adreno_irq_funcs a5xx_irq_funcs[32] = { 
	ADRENO_IRQ_CALLBACK(a5xx_err_callback),

	ADRENO_IRQ_CALLBACK(a5xx_err_callback),

	/* 6 - RBBM_ATB_ASYNC_OVERFLOW */

	/* 6 - RBBM_ATB_ASYNC_OVERFLOW */

	ADRENO_IRQ_CALLBACK(a5xx_err_callback),

	ADRENO_IRQ_CALLBACK(a5xx_err_callback),

	ADRENO_IRQ_CALLBACK(a5x_gpc_err_int_callback), /* 7 - GPC_ERR */

	ADRENO_IRQ_CALLBACK(a5xx_gpc_err_int_callback), /* 7 - GPC_ERR */

	ADRENO_IRQ_CALLBACK(a5xx_preempt_callback),/* 8 - CP_SW */

	ADRENO_IRQ_CALLBACK(a5xx_preempt_callback),/* 8 - CP_SW */

	ADRENO_IRQ_CALLBACK(a5xx_cp_hw_err_callback), /* 9 - CP_HW_ERROR */

	ADRENO_IRQ_CALLBACK(a5xx_cp_hw_err_callback), /* 9 - CP_HW_ERROR */

	/* 10 - CP_CCU_FLUSH_DEPTH_TS */

	/* 10 - CP_CCU_FLUSH_DEPTH_TS */

drivers/gpu/msm/adreno_a6xx.c

+24 −1
Original line number Original line Diff line number Diff line
@@ -1762,6 +1762,29 @@ static void a6xx_cp_callback(struct adreno_device *adreno_dev, int bit) 
	adreno_dispatcher_schedule(device);

	adreno_dispatcher_schedule(device);

}

}





/*

 * a6xx_gpc_err_int_callback() - Isr for GPC error interrupts

 * @adreno_dev: Pointer to device

 * @bit: Interrupt bit

 */

static void a6xx_gpc_err_int_callback(struct adreno_device *adreno_dev, int bit)

{

	struct kgsl_device *device = KGSL_DEVICE(adreno_dev);



	/*

	 * GPC error is typically the result of mistake SW programming.

	 * Force GPU fault for this interrupt so that we can debug it

	 * with help of register dump.

	 */



	KGSL_DRV_CRIT_RATELIMIT(device, "RBBM: GPC error\n");

	adreno_irqctrl(adreno_dev, 0);



	/* Trigger a fault in the dispatcher - this will effect a restart */

	adreno_set_gpu_fault(adreno_dev, ADRENO_SOFT_FAULT);

	adreno_dispatcher_schedule(device);

}



#define A6XX_INT_MASK \

#define A6XX_INT_MASK \

	((1 << A6XX_INT_CP_AHB_ERROR) |			\

	((1 << A6XX_INT_CP_AHB_ERROR) |			\

	 (1 << A6XX_INT_ATB_ASYNCFIFO_OVERFLOW) |	\

	 (1 << A6XX_INT_ATB_ASYNCFIFO_OVERFLOW) |	\
@@ -1787,7 +1810,7 @@ static struct adreno_irq_funcs a6xx_irq_funcs[32] = { 
	ADRENO_IRQ_CALLBACK(NULL), /* 5 - UNUSED */

	ADRENO_IRQ_CALLBACK(NULL), /* 5 - UNUSED */

	/* 6 - RBBM_ATB_ASYNC_OVERFLOW */

	/* 6 - RBBM_ATB_ASYNC_OVERFLOW */

	ADRENO_IRQ_CALLBACK(a6xx_err_callback),

	ADRENO_IRQ_CALLBACK(a6xx_err_callback),

	ADRENO_IRQ_CALLBACK(NULL), /* 7 - GPC_ERR */

	ADRENO_IRQ_CALLBACK(a6xx_gpc_err_int_callback), /* 7 - GPC_ERR */

	ADRENO_IRQ_CALLBACK(a6xx_preemption_callback),/* 8 - CP_SW */

	ADRENO_IRQ_CALLBACK(a6xx_preemption_callback),/* 8 - CP_SW */

	ADRENO_IRQ_CALLBACK(a6xx_cp_hw_err_callback), /* 9 - CP_HW_ERROR */

	ADRENO_IRQ_CALLBACK(a6xx_cp_hw_err_callback), /* 9 - CP_HW_ERROR */

	ADRENO_IRQ_CALLBACK(NULL),  /* 10 - CP_CCU_FLUSH_DEPTH_TS */

	ADRENO_IRQ_CALLBACK(NULL),  /* 10 - CP_CCU_FLUSH_DEPTH_TS */