diff options
| author | Chris Wilson | 2014-02-07 21:37:03 +0100 |
|---|---|---|
| committer | Daniel Vetter | 2014-02-12 18:52:56 +0100 |
| commit | c0cc8a556680afbfc6dc5033bdf9c8d2b85088e2 (patch) | |
| tree | 6ddaad6df7b4d031ae960727edf6f1a34b1c0ff1 /drivers/gpu/drm/i915/intel_display.c | |
| parent | drm/i915: Propagate PCI read/write errors during vga_set_state() (diff) | |
| download | kernel-qcow2-linux-c0cc8a556680afbfc6dc5033bdf9c8d2b85088e2.tar.gz kernel-qcow2-linux-c0cc8a556680afbfc6dc5033bdf9c8d2b85088e2.tar.xz kernel-qcow2-linux-c0cc8a556680afbfc6dc5033bdf9c8d2b85088e2.zip | |
drm/i915: Short-circuit no-op vga_set_state()
Touching the VGA registers risks a hard machine hang, at least on this
ivb machine after removing a conflicting efifb. This is more than likely
related to the discovery that VGA IO decode on the more recent PCH
platforms is terminally broken.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index cc426e10d746..1b2faa44764b 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -11513,6 +11513,9 @@ int intel_modeset_vga_set_state(struct drm_device *dev, bool state) return -EIO; } + if (!!(gmch_ctrl & INTEL_GMCH_VGA_DISABLE) == !state) + return 0; + if (state) gmch_ctrl &= ~INTEL_GMCH_VGA_DISABLE; else |