system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-10-24 04:06:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

drm/i915: Clear GDSR after reset on ILK

Browse source 
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: 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:26 +03:00 committed by Daniel Vetter
parent 0f08ffd663
commit 9aa7250feb
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/gpu/drm/i915/intel_uncore.c
View file

@ -1002,8 +1002,14 @@ static int ironlake_do_reset(struct drm_device *dev)
I915_WRITE(MCHBAR_MIRROR_BASE + ILK_GDSR, I915_WRITE(MCHBAR_MIRROR_BASE + ILK_GDSR,
ILK_GRDOM_MEDIA | ILK_GRDOM_RESET_ENABLE); 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); 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) static int gen6_do_reset(struct drm_device *dev)