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

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

Merge "msm: kgsl: Do not vote for cx-mx rail"

parents 4d4dc1f6 c1fd783a

drivers/gpu/msm/adreno.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -1285,6 +1285,7 @@ static inline int adreno_is_a6xx(struct adreno_device *adreno_dev) 
}

}





ADRENO_TARGET(a608, ADRENO_REV_A608)

ADRENO_TARGET(a608, ADRENO_REV_A608)

ADRENO_TARGET(a618, ADRENO_REV_A618)

ADRENO_TARGET(a630, ADRENO_REV_A630)

ADRENO_TARGET(a630, ADRENO_REV_A630)

ADRENO_TARGET(a640, ADRENO_REV_A640)

ADRENO_TARGET(a640, ADRENO_REV_A640)

ADRENO_TARGET(a680, ADRENO_REV_A680)

ADRENO_TARGET(a680, ADRENO_REV_A680)

drivers/gpu/msm/adreno_a6xx_gmu.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -194,7 +194,8 @@ static int _load_gmu_rpmh_ucode(struct kgsl_device *device) 
	_regwrite(cfg, PDC_GPU_TCS1_CMD0_DATA + PDC_CMD_OFFSET, 0x0);

	_regwrite(cfg, PDC_GPU_TCS1_CMD0_DATA + PDC_CMD_OFFSET, 0x0);

	_regwrite(cfg, PDC_GPU_TCS1_CMD0_MSGID + PDC_CMD_OFFSET * 2, 0x10108);

	_regwrite(cfg, PDC_GPU_TCS1_CMD0_MSGID + PDC_CMD_OFFSET * 2, 0x10108);





	if (adreno_is_a640(adreno_dev) || adreno_is_a680(adreno_dev))

	if (adreno_is_a640(adreno_dev) || adreno_is_a680(adreno_dev) ||

		adreno_is_a618(adreno_dev))

		_regwrite(cfg, PDC_GPU_TCS1_CMD0_ADDR + PDC_CMD_OFFSET * 2,

		_regwrite(cfg, PDC_GPU_TCS1_CMD0_ADDR + PDC_CMD_OFFSET * 2,

				0x30090);

				0x30090);

	else

	else
@@ -213,7 +214,8 @@ static int _load_gmu_rpmh_ucode(struct kgsl_device *device) 
	_regwrite(cfg, PDC_GPU_TCS3_CMD0_DATA + PDC_CMD_OFFSET, 0x3);

	_regwrite(cfg, PDC_GPU_TCS3_CMD0_DATA + PDC_CMD_OFFSET, 0x3);

	_regwrite(cfg, PDC_GPU_TCS3_CMD0_MSGID + PDC_CMD_OFFSET * 2, 0x10108);

	_regwrite(cfg, PDC_GPU_TCS3_CMD0_MSGID + PDC_CMD_OFFSET * 2, 0x10108);





	if (adreno_is_a640(adreno_dev) || adreno_is_a680(adreno_dev))

	if (adreno_is_a640(adreno_dev) || adreno_is_a680(adreno_dev) ||

		adreno_is_a618(adreno_dev))

		_regwrite(cfg, PDC_GPU_TCS3_CMD0_ADDR + PDC_CMD_OFFSET * 2,

		_regwrite(cfg, PDC_GPU_TCS3_CMD0_ADDR + PDC_CMD_OFFSET * 2,

				0x30090);

				0x30090);

	else

	else