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

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

Merge "msm: kgsl: Enable GPU slumber"

parents a4edfa24 89be34a7

drivers/gpu/msm/adreno.c

+0 −2
Original line number Diff line number Diff line
@@ -1035,8 +1035,6 @@ static int adreno_of_get_power(struct adreno_device *adreno_dev, 
	if (of_property_read_u32(node, "qcom,idle-timeout", &timeout))

		timeout = 80;



	/* Force disable slumber */

	timeout = 10000000;

	device->pwrctrl.interval_timeout = msecs_to_jiffies(timeout);



	device->pwrctrl.bus_control = of_property_read_bool(node,

drivers/gpu/msm/kgsl.c

+1 −3
Original line number Diff line number Diff line
@@ -1059,6 +1059,7 @@ static int kgsl_close_device(struct kgsl_device *device) 
	int result = 0;



	mutex_lock(&device->mutex);

	device->open_count--;

	if (device->open_count == 0) {



		/* Wait for the active count to go to 0 */
@@ -1158,9 +1159,6 @@ static int kgsl_open_device(struct kgsl_device *device) 
		complete_all(&device->hwaccess_gate);

		kgsl_pwrctrl_change_state(device, KGSL_STATE_ACTIVE);

		kgsl_active_count_put(device);



		/* Do not let the device close */

		device->open_count = 1;

	}

	device->open_count++;

err: