mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2025-01-23 09:30:04 +07:00
drm/i915: Fix ILK reset wait
We should be waiting for the reset bit to clear, not remain set. 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:
parent
a83d87fda6
commit
f67deb723d
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user