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

Commit ac64b66b 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: Run the idle timer while the GPU is not power collapsed"

parents 491ad79b 97f09ae7

drivers/gpu/msm/kgsl_pwrctrl.c

+2 −4
Original line number Diff line number Diff line
@@ -1440,7 +1440,8 @@ int kgsl_pwrctrl_wake(struct kgsl_device *device) 
		/* Enable state before turning on irq */

		kgsl_pwrctrl_set_state(device, KGSL_STATE_ACTIVE);

		kgsl_pwrctrl_irq(device, KGSL_PWRFLAGS_ON);



		mod_timer(&device->idle_timer, jiffies +

				device->pwrctrl.interval_timeout);

		pm_qos_update_request(&device->pwrctrl.pm_qos_req_dma,

				device->pwrctrl.pm_qos_latency);

	case KGSL_STATE_ACTIVE:
@@ -1541,9 +1542,6 @@ int kgsl_active_count_get(struct kgsl_device *device) 
		wait_for_completion(&device->hwaccess_gate);

		mutex_lock(&device->mutex);



		/* Stop the idle timer */

		del_timer_sync(&device->idle_timer);



		ret = kgsl_pwrctrl_wake(device);

	}

	if (ret == 0)