openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Ville Syrjälä 2014-05-19 19:23:25 +03:00 committed by Daniel Vetter
parent 4bdc729307
commit 0f08ffd663
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/gpu/drm/i915/intel_uncore.c
View File

@ -991,22 +991,17 @@ static int i965_do_reset(struct drm_device *dev)
static int ironlake_do_reset(struct drm_device *dev) static int ironlake_do_reset(struct drm_device *dev)
{ {
struct drm_i915_private *dev_priv = dev->dev_private; struct drm_i915_private *dev_priv = dev->dev_private;
u32 gdrst;
int ret; int ret;
gdrst = I915_READ(MCHBAR_MIRROR_BASE + ILK_GDSR);
gdrst &= ~ILK_GRDOM_MASK;
I915_WRITE(MCHBAR_MIRROR_BASE + ILK_GDSR, 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) & ret = wait_for((I915_READ(MCHBAR_MIRROR_BASE + ILK_GDSR) &
ILK_GRDOM_RESET_ENABLE) == 0, 500); ILK_GRDOM_RESET_ENABLE) == 0, 500);
if (ret) if (ret)
return ret; return ret;
gdrst = I915_READ(MCHBAR_MIRROR_BASE + ILK_GDSR);
gdrst &= ~ILK_GRDOM_MASK;
I915_WRITE(MCHBAR_MIRROR_BASE + ILK_GDSR, 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) & return wait_for((I915_READ(MCHBAR_MIRROR_BASE + ILK_GDSR) &
ILK_GRDOM_RESET_ENABLE) == 0, 500); ILK_GRDOM_RESET_ENABLE) == 0, 500);
} }