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

Commit cf2b5b67 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: Remove pm_qos_latency from legacy pdata struct"

parents 8c432cf8 230ad13c

drivers/gpu/msm/adreno.c

+0 −5
Original line number Diff line number Diff line
@@ -1500,11 +1500,6 @@ static int adreno_of_get_pdata(struct platform_device *pdev) 
	if (ret)

		goto err;



	/* get pm-qos-latency from target, set it to default if not found */

	if (of_property_read_u32(pdev->dev.of_node, "qcom,pm-qos-latency",

		&pdata->pm_qos_latency))

		pdata->pm_qos_latency = 501;



	if (of_property_read_u32(pdev->dev.of_node, "qcom,idle-timeout",

		&pdata->idle_timeout))

		pdata->idle_timeout = HZ/12;

drivers/gpu/msm/kgsl_pwrctrl.c

+3 −1
Original line number Diff line number Diff line
@@ -1010,7 +1010,9 @@ int kgsl_pwrctrl_init(struct kgsl_device *device) 
	pwr->interval_timeout = pdata->idle_timeout;

	pwr->strtstp_sleepwake = pdata->strtstp_sleepwake;



	pwr->pm_qos_latency = pdata->pm_qos_latency;

	if (kgsl_property_read_u32(device, "qcom,pm-qos-latency",

		&pwr->pm_qos_latency))

		pwr->pm_qos_latency = 501;



	pm_runtime_enable(device->parentdev);

include/linux/msm_kgsl.h

+0 −1
Original line number Diff line number Diff line
@@ -101,7 +101,6 @@ struct kgsl_device_platform_data { 
	struct coresight_device *csdev;

	struct coresight_platform_data *coresight_pdata;

	unsigned int chipid;

	unsigned int pm_qos_latency;

};



#ifdef CONFIG_MSM_KGSL_DRM