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

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

drm/i915: Clear GDSR after reset on ILK 



Clear the reset domain after a succesful GPU reset on ilk. We already
do that on gen4, so let's try to be a bit more consistent. And if
ether render or media reset fails, we might use the leftover value
in the register to pinpoint the culprit.

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 0f08ffd6

drivers/gpu/drm/i915/intel_uncore.c

+8 −2
Original line number Diff line number Diff line
@@ -1002,8 +1002,14 @@ static int ironlake_do_reset(struct drm_device *dev) 


	I915_WRITE(MCHBAR_MIRROR_BASE + ILK_GDSR,

		   ILK_GRDOM_MEDIA | ILK_GRDOM_RESET_ENABLE);

	return wait_for((I915_READ(MCHBAR_MIRROR_BASE + ILK_GDSR) &

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

			ILK_GRDOM_RESET_ENABLE) == 0, 500);

	if (ret)

		return ret;



	I915_WRITE(MCHBAR_MIRROR_BASE + ILK_GDSR, 0);



	return 0;

}



static int gen6_do_reset(struct drm_device *dev)