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

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

Merge "msm: kgsl: Disable unused GPU OPP for bus_devfreq"

parents 0d1b74e6 83665503

drivers/gpu/msm/kgsl_pwrctrl.c

+3 −3
Original line number Diff line number Diff line
@@ -1991,9 +1991,9 @@ static bool _gpu_freq_supported(struct kgsl_pwrctrl *pwr, unsigned int freq) 
	return false;

}



static void kgsl_pwrctrl_disable_unused_opp(struct kgsl_device *device)

void kgsl_pwrctrl_disable_unused_opp(struct kgsl_device *device,

		struct device *dev)

{

	struct device *dev = &device->pdev->dev;

	struct dev_pm_opp *opp;

	unsigned long freq = 0;

	int ret;
@@ -2083,7 +2083,7 @@ int kgsl_pwrctrl_init(struct kgsl_device *device) 
			pwr->pwrlevels[i].gpu_freq = freq;

	}



	kgsl_pwrctrl_disable_unused_opp(device);

	kgsl_pwrctrl_disable_unused_opp(device, &pdev->dev);



	kgsl_clk_set_rate(device, pwr->num_pwrlevels - 1);

drivers/gpu/msm/kgsl_pwrctrl.h

+3 −0
Original line number Diff line number Diff line
@@ -267,4 +267,7 @@ void kgsl_pwrctrl_set_constraint(struct kgsl_device *device, 
void kgsl_pwrctrl_update_l2pc(struct kgsl_device *device,

			unsigned long timeout_us);

void kgsl_pwrctrl_set_default_gpu_pwrlevel(struct kgsl_device *device);

void kgsl_pwrctrl_disable_unused_opp(struct kgsl_device *device,

		struct device *dev);



#endif /* __KGSL_PWRCTRL_H */

drivers/gpu/msm/kgsl_pwrscale.c

+6 −0
Original line number Diff line number Diff line
@@ -1041,6 +1041,12 @@ int kgsl_pwrscale_init(struct device *dev, const char *governor) 
		 * frequency.

		 */

		ret = dev_pm_opp_of_add_table(device->busmondev);

		/*

		 * Disable OPP which are not supported as per GPU freq plan.

		 * This is need to ensure freq_table specified in bus_profile

		 * above matches OPP table.

		 */

		kgsl_pwrctrl_disable_unused_opp(device, device->busmondev);

		if (!ret)

			bus_devfreq = devfreq_add_device(device->busmondev,

				&pwrscale->bus_profile.profile, "gpubw_mon",