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

Commit 55361ce0 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: Set SKIP_IB2_DISABLE for A420"

parents d127971b cb982424

drivers/gpu/msm/a4xx_reg.h

+8 −0
Original line number Diff line number Diff line
@@ -299,6 +299,14 @@ enum a4xx_rb_perfctr_rb_sel { 
#define A4XX_CP_ME_RAM_DATA		0x227

#define A4XX_CP_PFP_UCODE_ADDR		0x223

#define A4XX_CP_PFP_UCODE_DATA		0x224



#define A4XX_CP_DEBUG			0x22e

/*

 * CP debug settings for A4xx cores

 * MIU_128BIT_WRITE_ENABLE [25] - Allow 128 bit writes to the VBIF

 */

#define A4XX_CP_DEBUG_DEFAULT (1 << 25)



#define A4XX_CP_PROTECT_CTRL		0x250

#define A4XX_CP_DEBUG			0x22e

#define A4XX_CP_PERFCTR_CP_SEL_0	0x500

drivers/gpu/msm/adreno_a4xx.c

+4 −0
Original line number Diff line number Diff line
@@ -305,6 +305,10 @@ static void a4xx_start(struct adreno_device *adreno_dev) 
	kgsl_regwrite(device, UCHE_TRAP_BASE_LO, 0xffff0000);

	kgsl_regwrite(device, UCHE_TRAP_BASE_HI, 0xffff0000);



	/* On A420 cores turn on SKIP_IB2_DISABLE in addition to the default */

	kgsl_regwrite(device, A4XX_CP_DEBUG, A4XX_CP_DEBUG_DEFAULT |

			(adreno_is_a420(adreno_dev) ? (1 << 29) : 0));



}



int a4xx_perfcounter_enable_vbif(struct kgsl_device *device,