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

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

Merge "msm: kgsl: Remove HFI_INIT message for A650"

parents a18b9d29 5c9870e5

drivers/gpu/msm/a6xx_reg.h

+1 −0
Original line number Diff line number Diff line
@@ -392,6 +392,7 @@ 
#define A6XX_RBBM_PERFCTR_GPU_BUSY_MASKED        0x50B



#define A6XX_RBBM_ISDB_CNT                       0x533

#define A6XX_RBBM_NC_MODE_CNTL                   0X534



#define A6XX_RBBM_SECVID_TRUST_CNTL              0xF400

#define A6XX_RBBM_SECVID_TSB_TRUSTED_BASE_LO     0xF800

drivers/gpu/msm/adreno_a6xx.c

+3 −0
Original line number Diff line number Diff line
@@ -944,6 +944,7 @@ static void a6xx_start(struct adreno_device *adreno_dev) 
		amsbc = 1; /* Only valid for A640 and A680 */

		break;

	case KGSL_UBWC_4_0:

		mode = 0;

		rgb565_predicator = 1;

		amsbc = 1;

		break;
@@ -983,6 +984,8 @@ static void a6xx_start(struct adreno_device *adreno_dev) 
	/* Set hang detection threshold to 0x3FFFFF * 16 cycles */

	kgsl_regwrite(device, A6XX_RBBM_INTERFACE_HANG_INT_CNTL,

					(1 << 30) | 0x3fffff);

	if (adreno_is_a650(adreno_dev))

		kgsl_regwrite(device, A6XX_RBBM_NC_MODE_CNTL, 1);



	kgsl_regwrite(device, A6XX_UCHE_CLIENT_PF, 1);

drivers/gpu/msm/kgsl_hfi.c

+2 −1
Original line number Diff line number Diff line
@@ -681,7 +681,8 @@ int hfi_start(struct kgsl_device *device, 
		}

	}



	if (!adreno_is_a640(adreno_dev) && !adreno_is_a680(adreno_dev)) {

	if (!adreno_is_a640(adreno_dev) && !adreno_is_a680(adreno_dev) &&

			!adreno_is_a650(adreno_dev)) {

		result = hfi_send_gmu_init(gmu, boot_state);

		if (result)

			return result;