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

Commit f67deb72 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter
Browse files

drm/i915: Fix ILK reset wait 



We should be waiting for the reset bit to clear, not remain set.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent a83d87fd

drivers/gpu/drm/i915/intel_uncore.c

+4 −2
Original line number Diff line number Diff line
@@ -998,7 +998,8 @@ static int ironlake_do_reset(struct drm_device *dev) 
	gdrst &= ~GRDOM_MASK;

	I915_WRITE(MCHBAR_MIRROR_BASE + ILK_GDSR,

		   gdrst | GRDOM_RENDER | GRDOM_RESET_ENABLE);

	ret = wait_for(I915_READ(MCHBAR_MIRROR_BASE + ILK_GDSR) & 0x1, 500);

	ret = wait_for((I915_READ(MCHBAR_MIRROR_BASE + ILK_GDSR) &

			GRDOM_RESET_ENABLE) == 0, 500);

	if (ret)

		return ret;
@@ -1006,7 +1007,8 @@ static int ironlake_do_reset(struct drm_device *dev) 
	gdrst &= ~GRDOM_MASK;

	I915_WRITE(MCHBAR_MIRROR_BASE + ILK_GDSR,

		   gdrst | GRDOM_MEDIA | GRDOM_RESET_ENABLE);

	return wait_for(I915_READ(MCHBAR_MIRROR_BASE + ILK_GDSR) & 0x1, 500);

	return wait_for((I915_READ(MCHBAR_MIRROR_BASE + ILK_GDSR) &

			 GRDOM_RESET_ENABLE) == 0, 500);

}



static int gen6_do_reset(struct drm_device *dev)