Merge "ARM: dts: msm: Add the ACD table for sm8150" (fe471aff) · Commits · e / devices / android_kernel_oneplus_sm8150

arch/arm64/boot/dts/qcom/sm8150-v2.dtsi

+12 −0

Original line number	Diff line number	Diff line
		@@ -671,6 +671,18 @@
		reg-names = "kgsl_gmu_reg",
		"kgsl_gmu_pdc_cfg",
		"kgsl_gmu_pdc_seq";

		qcom,gpu-acd-table {
		/* Corresponds to levels in the GPU perf table */
		qcom,acd-enable-by-level = <0x1e>;
		qcom,acd-stride = <0x2>;
		qcom,acd-num-levels = <0x4>;

		qcom,acd-data = <0xa02d5ffd 0x00007611
		0xa02d5ffd 0x00006911
		0xa02d5ffd 0x00006111
		0x802d5ffd 0x00005411>;
		};
		};

		/* NPU overrides */

drivers/gpu/msm/adreno.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -966,10 +966,6 @@ static int adreno_of_parse_pwrlevels(struct adreno_device *adreno_dev,
		if (of_property_read_u32(child, "qcom,bus-max",
		&level->bus_max))
		level->bus_max = level->bus_freq;

		if (of_property_read_u32(child, "qcom,dvm-val",
		&level->acd_dvm_val))
		level->acd_dvm_val = 0xFFFFFFFF;
		}

		return 0;

drivers/gpu/msm/kgsl_gmu.c

+40 −4

Original line number	Diff line number	Diff line
		@@ -818,6 +818,38 @@ static void build_bwtable_cmd_cache(struct gmu_device *gmu)
		votes->cnoc_votes.cmd_data[i][j];
		}

		static int gmu_acd_probe(struct gmu_device gmu, struct device_node node)
		{
		struct hfi_acd_table_cmd *cmd = &gmu->hfi.acd_tbl_cmd;
		struct device_node *acd_node;

		acd_node = of_find_node_by_name(node, "qcom,gpu-acd-table");
		if (!acd_node)
		return -ENODEV;

		cmd->hdr = 0xFFFFFFFF;
		cmd->version = HFI_ACD_INIT_VERSION;
		cmd->enable_by_level = 0;
		cmd->stride = 0;
		cmd->num_levels = 0;

		of_property_read_u32(acd_node, "qcom,acd-stride", &cmd->stride);
		if (!cmd->stride \|\| cmd->stride > MAX_ACD_STRIDE)
		return -EINVAL;

		of_property_read_u32(acd_node, "qcom,acd-num-levels", &cmd->num_levels);
		if (!cmd->num_levels \|\| cmd->num_levels > MAX_ACD_NUM_LEVELS)
		return -EINVAL;

		of_property_read_u32(acd_node, "qcom,acd-enable-by-level",
		&cmd->enable_by_level);
		if (hweight32(cmd->enable_by_level) != cmd->num_levels)
		return -EINVAL;

		return of_property_read_u32_array(acd_node, "qcom,acd-data",
		cmd->data, cmd->stride * cmd->num_levels);
		}

		/*
		* gmu_bus_vote_init - initialized RPMh votes needed for bw scaling by GMU.
		* @gmu: Pointer to GMU device
		@@ -1321,7 +1353,6 @@ static int gmu_probe(struct kgsl_device device, struct device_node node)
		int j = gmu->num_gpupwrlevels - 1 - i;

		gmu->gpu_freqs[i] = pwr->pwrlevels[j].gpu_freq;
		gmu->acd_dvm_vals[i] = pwr->pwrlevels[j].acd_dvm_val;
		}

		/* Initializes GPU b/w levels configuration */
		@@ -1354,10 +1385,15 @@ static int gmu_probe(struct kgsl_device device, struct device_node node)
		gmu->idle_level = GPU_HW_ACTIVE;

		if (ADRENO_FEATURE(adreno_dev, ADRENO_ACD) && !noacd) {
		if (!gmu_acd_probe(gmu, node)) {
		/* Init the AOP mailbox if we have a valid ACD table */
		ret = gmu_aop_mailbox_init(device, gmu);
		if (ret)
		dev_err(&gmu->pdev->dev,
		"AOP mailbox init failed: %d\n", ret);
		} else
		dev_err(&gmu->pdev->dev,
		"ACD probe failed: missing or invalid table\n");
		}

		/* disable LM if the feature is not enabled */

drivers/gpu/msm/kgsl_gmu.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -157,7 +157,6 @@ struct kgsl_mailbox {
		* @ccl: CNOC BW scaling client
		* @idle_level: Minimal GPU idle power level
		* @fault_count: GMU fault count
		* @acd_dvm_vals: Table of DVM values that correspond to frequency levels
		* @mailbox: Messages to AOP for ACD enable/disable go through this
		*/
		struct gmu_device {
		@@ -190,7 +189,6 @@ struct gmu_device {
		unsigned int ccl;
		unsigned int idle_level;
		unsigned int fault_count;
		unsigned int acd_dvm_vals[MAX_GX_LEVELS];
		struct kgsl_mailbox mailbox;
		};

drivers/gpu/msm/kgsl_hfi.c

+28 −4

Original line number	Diff line number	Diff line
		@@ -500,7 +500,8 @@ static int hfi_send_dcvstbl(struct gmu_device *gmu)

		for (i = 0; i < gmu->num_gpupwrlevels; i++) {
		cmd.gx_votes[i].vote = gmu->rpmh_votes.gx_votes[i];
		cmd.gx_votes[i].acd = gmu->acd_dvm_vals[i];
		/* Hardcode this to the max threshold since it is not used */
		cmd.gx_votes[i].acd = 0xFFFFFFFF;
		/* Divide by 1000 to convert to kHz */
		cmd.gx_votes[i].freq = gmu->gpu_freqs[i] / 1000;
		}
		@@ -522,6 +523,15 @@ static int hfi_send_bwtbl(struct gmu_device *gmu)
		return hfi_send_generic_req(gmu, HFI_CMD_ID, cmd);
		}

		static int hfi_send_acd_tbl(struct gmu_device *gmu)
		{
		struct hfi_acd_table_cmd *cmd = &gmu->hfi.acd_tbl_cmd;

		cmd->hdr = CMD_MSG_HDR(H2F_MSG_ACD_TBL, sizeof(*cmd));

		return hfi_send_generic_req(gmu, HFI_CMD_IDX, cmd);
		}

		static int hfi_send_test(struct gmu_device *gmu)
		{
		struct hfi_test_cmd cmd = {
		@@ -662,6 +672,20 @@ static int hfi_verify_fw_version(struct kgsl_device *device,
		return 0;
		}

		static int hfi_send_acd_feature_ctrl(struct gmu_device *gmu,
		struct adreno_device *adreno_dev)
		{
		int ret = 0;

		if (test_bit(ADRENO_ACD_CTRL, &adreno_dev->pwrctrl_flag)) {
		ret = hfi_send_acd_tbl(gmu);
		if (!ret)
		ret = hfi_send_feature_ctrl(gmu, HFI_FEATURE_ACD, 1, 0);
		}

		return ret;
		}

		int hfi_start(struct kgsl_device *device,
		struct gmu_device *gmu, uint32_t boot_state)
		{
		@@ -716,10 +740,10 @@ int hfi_start(struct kgsl_device *device,
		*/
		if (HFI_VER_MAJOR(&gmu->hfi) >= 2) {
		result = hfi_send_feature_ctrl(gmu, HFI_FEATURE_ECP, 0, 0);
		if (test_bit(ADRENO_ACD_CTRL, &adreno_dev->pwrctrl_flag))
		result \|= hfi_send_feature_ctrl(gmu,
		HFI_FEATURE_ACD, 1, 0);
		if (result)
		return result;

		result = hfi_send_acd_feature_ctrl(gmu, adreno_dev);
		if (result)
		return result;