From: Thierry Reding <treding@nvidia.com>
Date: Fri, 25 Oct 2013 09:32:05 +0000 (+0200)
Subject: Merge remote-tracking branch 'drm-intel/for-linux-next'
X-Git-Tag: next-20131025~58
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=74c055879e9b7c00a2e60be4676b908422344782;p=karo-tx-linux.git

Merge remote-tracking branch 'drm-intel/for-linux-next'
---

74c055879e9b7c00a2e60be4676b908422344782
diff --cc drivers/gpu/drm/i915/intel_display.c
index f674267d24df,cfe9e7093b2a..3e79a2a0669d
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@@ -10643,9 -10790,10 +10759,9 @@@ void i915_redisable_vga(struct drm_devi
  	    (I915_READ(HSW_PWR_WELL_DRIVER) & HSW_PWR_WELL_STATE_ENABLED) == 0)
  		return;
  
- 	if (I915_READ(vga_reg) != VGA_DISP_DISABLE) {
+ 	if (!(I915_READ(vga_reg) & VGA_DISP_DISABLE)) {
  		DRM_DEBUG_KMS("Something enabled VGA plane, disabling it\n");
  		i915_disable_vga(dev);
 -		i915_disable_vga_mem(dev);
  	}
  }