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

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

Merge "msm: kgsl: Store power_interval_timeout in msec"

parents b3a0fafb 0dffed74

drivers/gpu/msm/adreno.c

+3 −5
Original line number Diff line number Diff line
@@ -420,9 +420,8 @@ static void adreno_input_event(struct input_handle *handle, unsigned int type, 
		 */



		device->flags |= KGSL_FLAG_WAKE_ON_TOUCH;

		kgsl_start_idle_timer(device);



		mod_timer(&device->idle_timer,

			jiffies + device->pwrctrl.interval_timeout);

	} else if (device->state == KGSL_STATE_SLUMBER) {

		schedule_work(&adreno_dev->input_work);

	}
@@ -1076,7 +1075,7 @@ static int adreno_of_get_power(struct adreno_device *adreno_dev, 
	l3_pwrlevel_probe(device, pdev->dev.of_node);



	/* Default timeout is 80 ms across all targets */

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

	device->pwrctrl.interval_timeout = 80;



	device->pwrctrl.minbw_timeout = 10;
@@ -1883,8 +1882,7 @@ static void adreno_pwrctrl_active_count_put(struct adreno_device *adreno_dev) 
			kgsl_pwrscale_update(device);

		}



		mod_timer(&device->idle_timer,

			jiffies + device->pwrctrl.interval_timeout);

		kgsl_start_idle_timer(device);

	}



	trace_kgsl_active_count(device,

drivers/gpu/msm/adreno_a6xx_gmu.c

+3 −6
Original line number Diff line number Diff line
@@ -2736,8 +2736,7 @@ static void a6xx_gmu_active_count_put(struct adreno_device *adreno_dev) 
	if (atomic_dec_and_test(&device->active_cnt)) {

		kgsl_pwrscale_update_stats(device);

		kgsl_pwrscale_update(device);

		mod_timer(&device->idle_timer,

			jiffies + device->pwrctrl.interval_timeout);

		kgsl_start_idle_timer(device);

	}



	trace_kgsl_active_count(device,
@@ -2933,8 +2932,7 @@ static int a6xx_boot(struct adreno_device *adreno_dev) 
	if (ret)

		return ret;



	mod_timer(&device->idle_timer, jiffies +

			device->pwrctrl.interval_timeout);

	kgsl_start_idle_timer(device);



	kgsl_pwrscale_wake(device);
@@ -3110,8 +3108,7 @@ static void gmu_idle_check(struct work_struct *work) 
			a6xx_power_off(adreno_dev);

	} else {

		kgsl_pwrscale_update(device);

		mod_timer(&device->idle_timer,

			jiffies + device->pwrctrl.interval_timeout);

		kgsl_start_idle_timer(device);

	}



done:

drivers/gpu/msm/adreno_a6xx_hwsched.c

+3 −6
Original line number Diff line number Diff line
@@ -298,8 +298,7 @@ static void a6xx_hwsched_active_count_put(struct adreno_device *adreno_dev) 
	if (atomic_dec_and_test(&device->active_cnt)) {

		kgsl_pwrscale_update_stats(device);

		kgsl_pwrscale_update(device);

		mod_timer(&device->idle_timer,

			jiffies + device->pwrctrl.interval_timeout);

		kgsl_start_idle_timer(device);

	}



	trace_kgsl_active_count(device,
@@ -527,8 +526,7 @@ static int a6xx_hwsched_boot(struct adreno_device *adreno_dev) 
	if (ret)

		return ret;



	mod_timer(&device->idle_timer, jiffies +

			device->pwrctrl.interval_timeout);

	kgsl_start_idle_timer(device);



	kgsl_pwrscale_wake(device);
@@ -666,8 +664,7 @@ static void hwsched_idle_check(struct work_struct *work) 
		a6xx_hwsched_power_off(adreno_dev);

	} else {

		kgsl_pwrscale_update(device);

		mod_timer(&device->idle_timer,

			jiffies + device->pwrctrl.interval_timeout);

		kgsl_start_idle_timer(device);

	}



done:

drivers/gpu/msm/adreno_a6xx_rgmu.c

+3 −6
Original line number Diff line number Diff line
@@ -64,8 +64,7 @@ static void a6xx_rgmu_active_count_put(struct adreno_device *adreno_dev) 
	if (atomic_dec_and_test(&device->active_cnt)) {

		kgsl_pwrscale_update_stats(device);

		kgsl_pwrscale_update(device);

		mod_timer(&device->idle_timer,

			jiffies + device->pwrctrl.interval_timeout);

		kgsl_start_idle_timer(device);

	}



	trace_kgsl_active_count(device,
@@ -856,8 +855,7 @@ static void rgmu_idle_check(struct work_struct *work) 
		a6xx_power_off(adreno_dev);

	} else {

		kgsl_pwrscale_update(device);

		mod_timer(&device->idle_timer,

			jiffies + device->pwrctrl.interval_timeout);

		kgsl_start_idle_timer(device);

	}



done:
@@ -891,8 +889,7 @@ static int a6xx_boot(struct adreno_device *adreno_dev) 
	if (ret)

		return ret;



	mod_timer(&device->idle_timer, jiffies +

			device->pwrctrl.interval_timeout);

	kgsl_start_idle_timer(device);



	kgsl_pwrscale_wake(device);

drivers/gpu/msm/adreno_dispatch.c

+1 −2
Original line number Diff line number Diff line
@@ -2454,8 +2454,7 @@ static void _dispatcher_update_timers(struct adreno_device *adreno_dev) 
	/* Kick the idle timer */

	mutex_lock(&device->mutex);

	kgsl_pwrscale_update(device);

	mod_timer(&device->idle_timer,

		jiffies + device->pwrctrl.interval_timeout);

	kgsl_start_idle_timer(device);

	mutex_unlock(&device->mutex);



	/* Check to see if we need to update the command timer */