diff options
| author | Ville Syrjälä | 2015-09-18 19:03:27 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2015-09-30 10:20:15 +0200 |
| commit | c039b7f2bf2e872b7b85d089ecf2f3cef215952e (patch) | |
| tree | 02cea1a8234b9f6e6ad2f2643dd491a983e54060 /drivers/gpu/drm/i915/intel_uncore.c | |
| parent | drm/i915: Always use GEN8_RING_PDP_{LDW, UDW} instead of hand rolling the reg... (diff) | |
| download | kernel-qcow2-linux-c039b7f2bf2e872b7b85d089ecf2f3cef215952e.tar.gz kernel-qcow2-linux-c039b7f2bf2e872b7b85d089ecf2f3cef215952e.tar.xz kernel-qcow2-linux-c039b7f2bf2e872b7b85d089ecf2f3cef215952e.zip | |
drm/i915: Include MCHBAR_MIRROR_BASE in ILK_GDSR
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_uncore.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_uncore.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c index 14d0831c6156..b43c6d025ac3 100644 --- a/drivers/gpu/drm/i915/intel_uncore.c +++ b/drivers/gpu/drm/i915/intel_uncore.c @@ -1429,21 +1429,21 @@ static int ironlake_do_reset(struct drm_device *dev) struct drm_i915_private *dev_priv = dev->dev_private; int ret; - I915_WRITE(MCHBAR_MIRROR_BASE + ILK_GDSR, + I915_WRITE(ILK_GDSR, ILK_GRDOM_RENDER | ILK_GRDOM_RESET_ENABLE); - ret = wait_for((I915_READ(MCHBAR_MIRROR_BASE + ILK_GDSR) & + ret = wait_for((I915_READ(ILK_GDSR) & ILK_GRDOM_RESET_ENABLE) == 0, 500); if (ret) return ret; - I915_WRITE(MCHBAR_MIRROR_BASE + ILK_GDSR, + I915_WRITE(ILK_GDSR, ILK_GRDOM_MEDIA | ILK_GRDOM_RESET_ENABLE); - ret = wait_for((I915_READ(MCHBAR_MIRROR_BASE + ILK_GDSR) & + ret = wait_for((I915_READ(ILK_GDSR) & ILK_GRDOM_RESET_ENABLE) == 0, 500); if (ret) return ret; - I915_WRITE(MCHBAR_MIRROR_BASE + ILK_GDSR, 0); + I915_WRITE(ILK_GDSR, 0); return 0; } |