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

Commit 8ac2ca99 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: Use the requested state in kgsl_pwrctrl_change_state"

parents b477fc53 ba0ce0d7

drivers/gpu/msm/kgsl_pwrctrl.c

+2 −3
Original line number Diff line number Diff line
@@ -1701,7 +1701,7 @@ int kgsl_pwrctrl_change_state(struct kgsl_device *device, int state) 
	kgsl_pwrctrl_request_state(device, state);



	/* Work through the legal state transitions */

	switch (device->requested_state) {

	switch (state) {

	case KGSL_STATE_INIT:

		status = _init(device);

		break;
@@ -1721,8 +1721,7 @@ int kgsl_pwrctrl_change_state(struct kgsl_device *device, int state) 
		status = _suspend(device);

		break;

	default:

		KGSL_PWR_INFO(device, "bad state request 0x%x\n",

				device->requested_state);

		KGSL_PWR_INFO(device, "bad state request 0x%x\n", state);

		kgsl_pwrctrl_request_state(device, KGSL_STATE_NONE);

		status = -EINVAL;

		break;