Merge remote-tracking branch 'drm/drm-next'

Conflicts:
	drivers/gpu/drm/i915/i915_dma.c
	drivers/gpu/drm/i915/intel_dp.c
	drivers/gpu/drm/i915/intel_drv.h

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

diff --cc drivers/gpu/drm/exynos/exynos_drm_drv.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_dma.c
index d5c784d486714d4cc5b9e1a45c8b17fe13d51871,b3873c945d1b19e7393433240596e38b0a2330b8..b20a8b2fe1f65b4c2201df38f150f39090d7dc9a
--- 1/drivers/gpu/drm/i915/i915_dma.c
--- 2/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@@ -1348,6 -1358,13 +1355,8 @@@ static int i915_load_modeset_init(struc
         */
        intel_fbdev_initial_config(dev);
  
 -      /*
 -       * Must do this after fbcon init so that
 -       * vgacon_save_screen() works during the handover.
 -       */
 -      i915_disable_vga_mem(dev);
+       intel_display_power_put(dev, POWER_DOMAIN_VGA);
+ 
        /* Only enable hotplug handling once the fbdev is fully set up. */
        dev_priv->enable_hotplug_processing = true;
  

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

diff --cc drivers/gpu/drm/i915/intel_display.c
index 581fb4b2f76637694877a2c4401acd2f35ade58c,617b963dfb67f230bbabdaf8a66f613592bacd88..f674267d24dfcecc15602f3d04b97138106908c0
--- 1/drivers/gpu/drm/i915/intel_display.c
--- 2/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@@ -10045,9 -10365,36 +10361,9 @@@ static void i915_disable_vga(struct drm
        POSTING_READ(vga_reg);
  }
  
 -static void i915_enable_vga_mem(struct drm_device *dev)
 -{
 -      /* Enable VGA memory on Intel HD */
 -      if (HAS_PCH_SPLIT(dev)) {
 -              vga_get_uninterruptible(dev->pdev, VGA_RSRC_LEGACY_IO);
 -              outb(inb(VGA_MSR_READ) | VGA_MSR_MEM_EN, VGA_MSR_WRITE);
 -              vga_set_legacy_decoding(dev->pdev, VGA_RSRC_LEGACY_IO |
 -                                                 VGA_RSRC_LEGACY_MEM |
 -                                                 VGA_RSRC_NORMAL_IO |
 -                                                 VGA_RSRC_NORMAL_MEM);
 -              vga_put(dev->pdev, VGA_RSRC_LEGACY_IO);
 -      }
 -}
 -
 -void i915_disable_vga_mem(struct drm_device *dev)
 -{
 -      /* Disable VGA memory on Intel HD */
 -      if (HAS_PCH_SPLIT(dev)) {
 -              vga_get_uninterruptible(dev->pdev, VGA_RSRC_LEGACY_IO);
 -              outb(inb(VGA_MSR_READ) & ~VGA_MSR_MEM_EN, VGA_MSR_WRITE);
 -              vga_set_legacy_decoding(dev->pdev, VGA_RSRC_LEGACY_IO |
 -                                                 VGA_RSRC_NORMAL_IO |
 -                                                 VGA_RSRC_NORMAL_MEM);
 -              vga_put(dev->pdev, VGA_RSRC_LEGACY_IO);
 -      }
 -}
 -
  void intel_modeset_init_hw(struct drm_device *dev)
  {
-       intel_init_power_well(dev);
+       struct drm_i915_private *dev_priv = dev->dev_private;
  
        intel_prepare_ddi(dev);
  

diff --cc drivers/gpu/drm/i915/intel_dp.c
index 2c555f91bfae076688fe07e1694c75932a9c97d2,4f52ec75b39feb13ab03db507dc7a1c7a8b52931..68ac9ac421be4448a81c8fad8d47d6f2578c0a32
--- 1/drivers/gpu/drm/i915/intel_dp.c
--- 2/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@@ -1466,8 -1541,8 +1541,8 @@@ static void intel_edp_psr_setup(struct 
        intel_edp_psr_write_vsc(intel_dp, &psr_vsc);
  
        /* Avoid continuous PSR exit by masking memup and hpd */
-       I915_WRITE(EDP_PSR_DEBUG_CTL, EDP_PSR_DEBUG_MASK_MEMUP |
+       I915_WRITE(EDP_PSR_DEBUG_CTL(dev), EDP_PSR_DEBUG_MASK_MEMUP |
 -                 EDP_PSR_DEBUG_MASK_HPD);
 +                 EDP_PSR_DEBUG_MASK_HPD | EDP_PSR_DEBUG_MASK_LPSP);
  
        intel_dp->psr_setup_done = true;
  }

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

diff --cc drivers/staging/imx-drm/imx-drm-core.c
Simple merge