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

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

Merge "msm: kgsl: Get resource address from cmd-db driver"

parents d87d15de b73c764e

drivers/gpu/msm/adreno_a6xx_gmu.c

+17 −4
Original line number Original line Diff line number Diff line
@@ -121,6 +121,8 @@ static int a6xx_load_pdc_ucode(struct kgsl_device *device) 
	const struct adreno_a6xx_core *a6xx_core = to_a6xx_core(adreno_dev);

	const struct adreno_a6xx_core *a6xx_core = to_a6xx_core(adreno_dev);

	u32 vrm_resource_addr = cmd_db_read_addr("vrm.soc");

	u32 vrm_resource_addr = cmd_db_read_addr("vrm.soc");

	u32 xo_resource_addr = cmd_db_read_addr("xo.lvl");

	u32 xo_resource_addr = cmd_db_read_addr("xo.lvl");

	u32 cx_res_addr = cmd_db_read_addr("cx.lvl");

	u32 mx_res_addr = cmd_db_read_addr("mx.lvl");





	if (!xo_resource_addr) {

	if (!xo_resource_addr) {

		dev_err(&gmu->pdev->dev,

		dev_err(&gmu->pdev->dev,
@@ -128,6 +130,17 @@ static int a6xx_load_pdc_ucode(struct kgsl_device *device) 
		return -ENOENT;

		return -ENOENT;

	}

	}





	if (!cx_res_addr) {

		dev_err(&gmu->pdev->dev,

				"Failed to get 'cx.lvl' addr from cmd_db\n");

		return -ENOENT;

	}



	if (!mx_res_addr) {

		dev_err(&gmu->pdev->dev,

				"Failed to get 'mx.lvl' addr from cmd_db\n");

		return -ENOENT;

	}

	/*

	/*

	 * Older A6x platforms specified PDC registers in the DT using a

	 * Older A6x platforms specified PDC registers in the DT using a

	 * single base pointer that encompassed the entire PDC range. Current

	 * single base pointer that encompassed the entire PDC range. Current
@@ -205,10 +218,10 @@ static int a6xx_load_pdc_ucode(struct kgsl_device *device) 
	_regwrite(cfg, PDC_GPU_TCS1_CMD_WAIT_FOR_CMPL_BANK, 0);

	_regwrite(cfg, PDC_GPU_TCS1_CMD_WAIT_FOR_CMPL_BANK, 0);

	_regwrite(cfg, PDC_GPU_TCS1_CONTROL, 0);

	_regwrite(cfg, PDC_GPU_TCS1_CONTROL, 0);

	_regwrite(cfg, PDC_GPU_TCS1_CMD0_MSGID, 0x10108);

	_regwrite(cfg, PDC_GPU_TCS1_CMD0_MSGID, 0x10108);

	_regwrite(cfg, PDC_GPU_TCS1_CMD0_ADDR, 0x30010);

	_regwrite(cfg, PDC_GPU_TCS1_CMD0_ADDR, mx_res_addr);

	_regwrite(cfg, PDC_GPU_TCS1_CMD0_DATA, 1);

	_regwrite(cfg, PDC_GPU_TCS1_CMD0_DATA, 1);

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

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

	_regwrite(cfg, PDC_GPU_TCS1_CMD0_ADDR + PDC_CMD_OFFSET, 0x30000);

	_regwrite(cfg, PDC_GPU_TCS1_CMD0_ADDR + PDC_CMD_OFFSET, cx_res_addr);

	_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);
@@ -230,10 +243,10 @@ static int a6xx_load_pdc_ucode(struct kgsl_device *device) 
	_regwrite(cfg, PDC_GPU_TCS3_CMD_WAIT_FOR_CMPL_BANK, 0);

	_regwrite(cfg, PDC_GPU_TCS3_CMD_WAIT_FOR_CMPL_BANK, 0);

	_regwrite(cfg, PDC_GPU_TCS3_CONTROL, 0);

	_regwrite(cfg, PDC_GPU_TCS3_CONTROL, 0);

	_regwrite(cfg, PDC_GPU_TCS3_CMD0_MSGID, 0x10108);

	_regwrite(cfg, PDC_GPU_TCS3_CMD0_MSGID, 0x10108);

	_regwrite(cfg, PDC_GPU_TCS3_CMD0_ADDR, 0x30010);

	_regwrite(cfg, PDC_GPU_TCS3_CMD0_ADDR, mx_res_addr);

	_regwrite(cfg, PDC_GPU_TCS3_CMD0_DATA, 2);

	_regwrite(cfg, PDC_GPU_TCS3_CMD0_DATA, 2);

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

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

	_regwrite(cfg, PDC_GPU_TCS3_CMD0_ADDR + PDC_CMD_OFFSET, 0x30000);

	_regwrite(cfg, PDC_GPU_TCS3_CMD0_ADDR + PDC_CMD_OFFSET, cx_res_addr);





	if (adreno_is_a618(adreno_dev) || adreno_is_a619(adreno_dev) ||

	if (adreno_is_a618(adreno_dev) || adreno_is_a619(adreno_dev) ||

			adreno_is_a650_family(adreno_dev))

			adreno_is_a650_family(adreno_dev))