From 3efac7c814f2a99364877f07fa58a5974abd241c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= Date: Fri, 25 Jan 2013 21:44:48 +0200 Subject: [PATCH] --- yaml --- r: 358081 b: refs/heads/master c: 209d52110a32c2069b5d870504e73fdb0e30fc51 h: refs/heads/master i: 358079: 61f88f7a1ded2b118e66a8700df6ebb3aadf0420 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/intel_display.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e744cc51c878..f0b54dd01549 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fe31b574fb2563f3aaa24dec302ddd0a033cda0f +refs/heads/master: 209d52110a32c2069b5d870504e73fdb0e30fc51 diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/drivers/gpu/drm/i915/intel_display.c index 62f45907e4df..d75c6a0a4bd6 100644 --- a/trunk/drivers/gpu/drm/i915/intel_display.c +++ b/trunk/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); } }