Merge "msm: kgsl: Don't repeatedly call adreno_stop during reset" (4d857048) · Commits · e / devices / android_kernel_sony_msm8994

drivers/gpu/msm/adreno.c

+7 −12

Original line number	Diff line number	Diff line
		@@ -1842,21 +1842,16 @@ int adreno_reset(struct kgsl_device *device)
		KGSL_DEV_ERR_ONCE(device, "Device soft reset failed\n");
		}
		if (ret) {
		for (i = 0; i < NUM_TIMES_RESET_RETRY; i++) {
		/* If soft reset failed/skipped, then pull the power */
		ret = adreno_stop(device);
		if (ret) {
		msleep(20);
		continue;
		}
		adreno_stop(device);

		/* Keep trying to start the device until it works */
		for (i = 0; i < NUM_TIMES_RESET_RETRY; i++) {
		ret = adreno_start(device);
		if (!ret)
		break;

		if (ret) {
		msleep(20);
		continue;
		}
		break;
		}
		}
		if (ret)