BackMerge v4.19-rc5 into drm-next

Sean Paul requested an -rc5 backmerge from some sun4i fixes.

Signed-off-by: Dave Airlie <airlied@redhat.com>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdkfd/kfd_device.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdkfd/kfd_priv.h
Simple merge

diff --cc drivers/gpu/drm/amd/amdkfd/kfd_topology.c
Simple merge

diff --cc drivers/gpu/drm/amd/include/kgd_kfd_interface.h
Simple merge

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

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

diff --cc drivers/gpu/drm/i915/gvt/handlers.c
index d26258786e3ff90ed959ca7aab253b7939594a08,94c1089ecf59ee46178a6e73be6f73d6307936a0..90f50f67909a090d72b4cee84077d0b530a4969b
--- 1/drivers/gpu/drm/i915/gvt/handlers.c
--- 2/drivers/gpu/drm/i915/gvt/handlers.c
+++ b/drivers/gpu/drm/i915/gvt/handlers.c
@@@ -2798,9 -2823,16 +2817,11 @@@ static int init_skl_mmio_info(struct in
        MMIO_F(_MMIO(_DPD_AUX_CH_CTL), 6 * 4, 0, 0, 0, D_SKL_PLUS, NULL,
                                                dp_aux_ch_ctl_mmio_write);
  
 -      /*
 -       * Use an arbitrary power well controlled by the PWR_WELL_CTL
 -       * register.
 -       */
 -      MMIO_D(HSW_PWR_WELL_CTL_BIOS(SKL_DISP_PW_MISC_IO), D_SKL_PLUS);
 -      MMIO_DH(HSW_PWR_WELL_CTL_DRIVER(SKL_DISP_PW_MISC_IO), D_SKL_PLUS, NULL,
 -              skl_power_well_ctl_write);
 +      MMIO_D(HSW_PWR_WELL_CTL1, D_SKL_PLUS);
 +      MMIO_DH(HSW_PWR_WELL_CTL2, D_SKL_PLUS, NULL, skl_power_well_ctl_write);
  
+       MMIO_DH(DBUF_CTL, D_SKL_PLUS, NULL, gen9_dbuf_ctl_mmio_write);
+ 
        MMIO_D(_MMIO(0xa210), D_SKL_PLUS);
        MMIO_D(GEN9_MEDIA_PG_IDLE_HYSTERESIS, D_SKL_PLUS);
        MMIO_D(GEN9_RENDER_PG_IDLE_HYSTERESIS, D_SKL_PLUS);

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

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

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

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

diff --cc drivers/gpu/drm/nouveau/dispnv50/disp.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nouveau_connector.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nouveau_fbcon.c
Simple merge

diff --cc drivers/gpu/drm/sun4i/sun4i_drv.c
index 1e41c3f5fd6d1c851ac4d2e0dbb2aede2419c404,8b0cd08034e0c74bb80f57fca43710228077b29c..9027ddde4262c22ba9bb4f9e09b8571af39f2247
--- 1/drivers/gpu/drm/sun4i/sun4i_drv.c
--- 2/drivers/gpu/drm/sun4i/sun4i_drv.c
+++ b/drivers/gpu/drm/sun4i/sun4i_drv.c
@@@ -402,10 -418,8 +402,9 @@@ static const struct of_device_id sun4i_
        { .compatible = "allwinner,sun8i-a33-display-engine" },
        { .compatible = "allwinner,sun8i-a83t-display-engine" },
        { .compatible = "allwinner,sun8i-h3-display-engine" },
-       { .compatible = "allwinner,sun8i-r40-display-engine" },
        { .compatible = "allwinner,sun8i-v3s-display-engine" },
        { .compatible = "allwinner,sun9i-a80-display-engine" },
 +      { .compatible = "allwinner,sun50i-a64-display-engine" },
        { }
  };
  MODULE_DEVICE_TABLE(of, sun4i_drv_of_table);

diff --cc drivers/gpu/drm/sun4i/sun8i_hdmi_phy.c
Simple merge

diff --cc drivers/gpu/drm/sun4i/sun8i_mixer.c
Simple merge

diff --cc drivers/gpu/drm/sun4i/sun8i_tcon_top.c
Simple merge

diff --cc drivers/gpu/drm/vc4/vc4_plane.c
Simple merge

diff --cc drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
Simple merge

diff --cc include/drm/drm_drv.h
Simple merge