From: Rob Clark <robdclark@chromium.org>
Date: Mon, 6 Dec 2021 17:13:49 +0000 (-0800)
Subject: Merge remote-tracking branch 'drm/drm-next' into msm-next-staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=83b965d118cbab1dbdfffdff8cabc8c1cfd183c6;p=linux.git

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

Backmerge drm-next to pull in:

  8f59ee9a570c ("drm/msm/dsi: Adjust probe order")

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

83b965d118cbab1dbdfffdff8cabc8c1cfd183c6
diff --cc drivers/gpu/drm/msm/dsi/dsi.h
index 66443dc985008,bb39e7ca802de..f46df52c69855
--- a/drivers/gpu/drm/msm/dsi/dsi.h
+++ b/drivers/gpu/drm/msm/dsi/dsi.h
@@@ -118,10 -118,8 +118,10 @@@ int msm_dsi_host_set_display_mode(struc
  struct drm_panel *msm_dsi_host_get_panel(struct mipi_dsi_host *host);
  unsigned long msm_dsi_host_get_mode_flags(struct mipi_dsi_host *host);
  struct drm_bridge *msm_dsi_host_get_bridge(struct mipi_dsi_host *host);
- int msm_dsi_host_register(struct mipi_dsi_host *host, bool check_defer);
+ int msm_dsi_host_register(struct mipi_dsi_host *host);
  void msm_dsi_host_unregister(struct mipi_dsi_host *host);
 +void msm_dsi_host_set_phy_mode(struct mipi_dsi_host *host,
 +			struct msm_dsi_phy *src_phy);
  int msm_dsi_host_set_src_pll(struct mipi_dsi_host *host,
  			struct msm_dsi_phy *src_phy);
  void msm_dsi_host_reset_phy(struct mipi_dsi_host *host);
diff --cc drivers/gpu/drm/msm/msm_drv.h
index b24bc501c2310,eb984d925f4d5..abc668f15f3de
--- a/drivers/gpu/drm/msm/msm_drv.h
+++ b/drivers/gpu/drm/msm/msm_drv.h
@@@ -338,8 -335,16 +338,10 @@@ int msm_hdmi_modeset_init(struct hdmi *
  void __init msm_hdmi_register(void);
  void __exit msm_hdmi_unregister(void);
  
 -struct msm_edp;
 -void __init msm_edp_register(void);
 -void __exit msm_edp_unregister(void);
 -int msm_edp_modeset_init(struct msm_edp *edp, struct drm_device *dev,
 -		struct drm_encoder *encoder);
 -
  struct msm_dsi;
  #ifdef CONFIG_DRM_MSM_DSI
+ int dsi_dev_attach(struct platform_device *pdev);
+ void dsi_dev_detach(struct platform_device *pdev);
  void __init msm_dsi_register(void);
  void __exit msm_dsi_unregister(void);
  int msm_dsi_modeset_init(struct msm_dsi *msm_dsi, struct drm_device *dev,