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

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

drm/i915: Kill RMW from ILK reset code 



All the other bits in the GDSR register are read-only, so we don't have
to preserve them when we perform a GPU reset.

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 4bdc7293

drivers/gpu/drm/i915/intel_uncore.c

+2 −7
Original line number Diff line number Diff line
@@ -991,22 +991,17 @@ static int i965_do_reset(struct drm_device *dev) 
static int ironlake_do_reset(struct drm_device *dev)

{

	struct drm_i915_private *dev_priv = dev->dev_private;

	u32 gdrst;

	int ret;



	gdrst = I915_READ(MCHBAR_MIRROR_BASE + ILK_GDSR);

	gdrst &= ~ILK_GRDOM_MASK;

	I915_WRITE(MCHBAR_MIRROR_BASE + ILK_GDSR,

		   gdrst | ILK_GRDOM_RENDER | ILK_GRDOM_RESET_ENABLE);

		   ILK_GRDOM_RENDER | ILK_GRDOM_RESET_ENABLE);

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

			ILK_GRDOM_RESET_ENABLE) == 0, 500);

	if (ret)

		return ret;



	gdrst = I915_READ(MCHBAR_MIRROR_BASE + ILK_GDSR);

	gdrst &= ~ILK_GRDOM_MASK;

	I915_WRITE(MCHBAR_MIRROR_BASE + ILK_GDSR,

		   gdrst | ILK_GRDOM_MEDIA | ILK_GRDOM_RESET_ENABLE);

		   ILK_GRDOM_MEDIA | ILK_GRDOM_RESET_ENABLE);

	return wait_for((I915_READ(MCHBAR_MIRROR_BASE + ILK_GDSR) &

			 ILK_GRDOM_RESET_ENABLE) == 0, 500);

}