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

diff --cc drivers/gpu/drm/drm_fb_helper.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_dma.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_reg.h
Simple merge

diff --cc drivers/gpu/drm/i915/i915_sysfs.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_display.c
index f674267d24dfcecc15602f3d04b97138106908c0,16d3b1e44c2453c060f0f429a8f9090fe47b8337..4452a5b225d1fb02131bd14bdfa922db17d677db
--- 1/drivers/gpu/drm/i915/intel_display.c
--- 2/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@@ -10643,9 -10711,10 +10680,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);
        }
  }
  

diff --cc drivers/gpu/drm/i915/intel_dp.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_pm.c
Simple merge