Merge "msm: kgsl: Clear and set device started bit on soft reset" (26cef976) · Commits · e / devices / android_kernel_sony_msm8994

drivers/gpu/msm/adreno.c

+6 −1

Original line number	Diff line number	Diff line
		@@ -2127,6 +2127,8 @@ static int adreno_soft_reset(struct kgsl_device *device)
		kgsl_pwrctrl_irq(device, KGSL_PWRFLAGS_OFF);

		adreno_clear_gpu_fault(adreno_dev);
		/* since device is oficially off now clear start bit */
		clear_bit(ADRENO_DEVICE_STARTED, &adreno_dev->priv);

		/* Delete the idle timer */
		del_timer_sync(&device->idle_timer);
		@@ -2167,8 +2169,11 @@ static int adreno_soft_reset(struct kgsl_device *device)
		else
		ret = adreno_ringbuffer_cold_start(adreno_dev);

		if (!ret)
		if (!ret) {
		device->reset_counter++;
		/* device is back online */
		set_bit(ADRENO_DEVICE_STARTED, &adreno_dev->priv);
		}

		return ret;
		}