BackMerge v4.19-rc6 into drm-next

I have some pulls based on rc6, and I prefer to have an explicit backmerge.

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

diff --cc MAINTAINERS
Simple merge

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

diff --cc drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 715422bb30db6fb1f3dd89c8fa55cd8688378b92,96875950845a4aa7d30fdf24014c8f08472dbe2f..6a2342d727426133eb1bf29a6be8891370c8a562
--- 1/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
--- 2/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@@ -1010,10 -1010,10 +1098,11 @@@ static void handle_hpd_irq(void *param
        struct amdgpu_dm_connector *aconnector = (struct amdgpu_dm_connector *)param;
        struct drm_connector *connector = &aconnector->base;
        struct drm_device *dev = connector->dev;
+       enum dc_connection_type new_connection_type = dc_connection_none;
  
 -      /* In case of failure or MST no need to update connector status or notify the OS
 -       * since (for MST case) MST does this in it's own context.
 +      /*
 +       * In case of failure or MST no need to update connector status or notify the OS
 +       * since (for MST case) MST does this in its own context.
         */
        mutex_lock(&aconnector->hpd_lock);
  
@@@ -1120,9 -1134,9 +1223,10 @@@ static void handle_hpd_rx_irq(void *par
        struct drm_device *dev = connector->dev;
        struct dc_link *dc_link = aconnector->dc_link;
        bool is_mst_root_connector = aconnector->mst_mgr.mst_state;
+       enum dc_connection_type new_connection_type = dc_connection_none;
  
 -      /* TODO:Temporary add mutex to protect hpd interrupt not have a gpio
 +      /*
 +       * TODO:Temporary add mutex to protect hpd interrupt not have a gpio
         * conflict, after implement i2c helper, this mutex should be
         * retired.
         */

diff --cc drivers/gpu/drm/amd/display/dc/core/dc_link.c
Simple merge

diff --cc drivers/gpu/drm/amd/display/dc/dc_link.h
Simple merge

diff --cc drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
Simple merge

diff --cc drivers/gpu/drm/arm/malidp_drv.c
Simple merge

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

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

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