Merge "msm: kgsl: Correct the state transitions in suspend function" (ac7b931c) · Commits · e / devices / android_kernel_sony_msm8998

drivers/gpu/msm/kgsl_pwrctrl.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -2785,7 +2785,7 @@ static int _suspend(struct kgsl_device *device)
		if ((device->state == KGSL_STATE_NONE) \|\|
		(device->state == KGSL_STATE_INIT) \|\|
		(device->state == KGSL_STATE_SUSPEND))
		goto done;
		return ret;

		/* drain to prevent from more commands being submitted */
		device->ftbl->drain(device);
		@@ -2802,7 +2802,6 @@ static int _suspend(struct kgsl_device *device)
		if (ret)
		goto err;

		done:
		kgsl_pwrctrl_set_state(device, KGSL_STATE_SUSPEND);
		return ret;