From: Ville Syrjälä Date: Fri, 25 Jan 2013 19:44:48 +0000 (+0200) Subject: drm/i915: Set the SR01 "screen off" bit in i915_redisable_vga() too X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=209d52110a32c2069b5d870504e73fdb0e30fc51;p=deliverable%2Flinux.git drm/i915: Set the SR01 "screen off" bit in i915_redisable_vga() too From BSpec / SR01 - Clocking Mode: "The following sequence must be used when disabling the VGA plane. Write SR01 to set bit 5 = 1 to disable video output. Wait for 100us. Disable the VGA plane via Bit 31 of the MMIO VGA control." So simply call i915_disable_vga() from i915_redisable_vga(). Signed-off-by: Ville Syrjälä Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 62f45907e4df..d75c6a0a4bd6 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -8936,8 +8936,7 @@ void i915_redisable_vga(struct drm_device *dev) if (I915_READ(vga_reg) != VGA_DISP_DISABLE) { DRM_DEBUG_KMS("Something enabled VGA plane, disabling it\n"); - I915_WRITE(vga_reg, VGA_DISP_DISABLE); - POSTING_READ(vga_reg); + i915_disable_vga(dev); } }