summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_uncore.c
diff options
context:
space:
mode:
authorVille Syrjälä2014-05-19 18:23:22 +0200
committerDaniel Vetter2014-05-20 09:56:54 +0200
commita83d87fda6932980fa3081e56fe081ef3dbd767a (patch)
treeb2b3f0486e2699fe6c46d3b8e9978895370baeb7 /drivers/gpu/drm/i915/intel_uncore.c
parentdrm/i915: Invalidate our pages under memory pressure (diff)
downloadkernel-qcow2-linux-a83d87fda6932980fa3081e56fe081ef3dbd767a.tar.gz
kernel-qcow2-linux-a83d87fda6932980fa3081e56fe081ef3dbd767a.tar.xz
kernel-qcow2-linux-a83d87fda6932980fa3081e56fe081ef3dbd767a.zip
drm/i915: Drop bogus comments about display reset
There are comments in the gen4-5 reset functions stating that we can't reset render and media without also doing a display reset. But that's exactly what the code does, ie. we don't perform a display reset. Drop the bogus comments. 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>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_uncore.c')
-rw-r--r--drivers/gpu/drm/i915/intel_uncore.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c
index 76dc185793ce..45b3d6ab6054 100644
--- a/drivers/gpu/drm/i915/intel_uncore.c
+++ b/drivers/gpu/drm/i915/intel_uncore.c
@@ -976,7 +976,6 @@ static int i965_do_reset(struct drm_device *dev)
if (ret)
return ret;
- /* We can't reset render&media without also resetting display ... */
pci_write_config_byte(dev->pdev, I965_GDRST,
GRDOM_MEDIA | GRDOM_RESET_ENABLE);
@@ -1003,7 +1002,6 @@ static int ironlake_do_reset(struct drm_device *dev)
if (ret)
return ret;
- /* We can't reset render&media without also resetting display ... */
gdrst = I915_READ(MCHBAR_MIRROR_BASE + ILK_GDSR);
gdrst &= ~GRDOM_MASK;
I915_WRITE(MCHBAR_MIRROR_BASE + ILK_GDSR,