Merge remote-tracking branch 'drm-misc/drm-misc-next' into msm-next

Backmerge drm-misc-next to pick up some dependencies for drm/msm
patches, in particular:

https://patchwork.freedesktop.org/patch/570219/?series=127251&rev=1
https://patchwork.freedesktop.org/series/123411/

Signed-off-by: Rob Clark <robdclark@chromium.org>

diff --cc drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h
Simple merge

diff --cc drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c
Simple merge

diff --cc drivers/gpu/drm/msm/dp/dp_display.c
index f8a9e8403c264476da2bb30de7cc6ec1e0057da4,1b88fb52726f244b28a95c6c8133bb0a864cc3a9..0405ff08d7622208c66ee4a786cad14963abc5ce
--- 1/drivers/gpu/drm/msm/dp/dp_display.c
--- 2/drivers/gpu/drm/msm/dp/dp_display.c
+++ b/drivers/gpu/drm/msm/dp/dp_display.c
@@@ -337,12 -365,14 +337,14 @@@ static int dp_display_send_hpd_notifica
        /* reset video pattern flag on disconnect */
        if (!hpd) {
                dp->panel->video_test = false;
-               drm_dp_set_subconnector_property(dp->dp_display.connector,
-                                                connector_status_disconnected,
-                                                dp->panel->dpcd, dp->panel->downstream_ports);
+               if (!dp->dp_display.is_edp)
+                       drm_dp_set_subconnector_property(dp->dp_display.connector,
+                                                        connector_status_disconnected,
+                                                        dp->panel->dpcd,
+                                                        dp->panel->downstream_ports);
        }
  
 -      dp->dp_display.is_connected = hpd;
 +      dp->dp_display.link_ready = hpd;
  
        drm_dbg_dp(dp->drm_dev, "type=%d hpd=%d\n",
                        dp->dp_display.connector_type, hpd);

diff --cc drivers/gpu/drm/msm/dp/dp_drm.c
Simple merge

diff --cc drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c
Simple merge

diff --cc drivers/gpu/drm/msm/msm_drv.c
Simple merge

diff --cc drivers/gpu/drm/msm/msm_gem_submit.c
Simple merge