diff options
| author | Dave Airlie <airlied@redhat.com> | 2021-03-26 12:59:21 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2021-03-26 13:04:17 +1000 |
| commit | 09d78dde88ef95a27b54a6e450ee700ccabdf39d (patch) | |
| tree | 0d584d49ff17b6be4498a8256f43db9d3f630975 /drivers/gpu/drm/msm/dsi/pll/dsi_pll.h | |
| parent | 4e8d123fca536d1b55f5f9927ad9ee5a444ac41b (diff) | |
| parent | 627dc55c273dab308303a5217bd3e767d7083ddb (diff) | |
Merge tag 'drm-msm-fixes-2021-02-25' of https://gitlab.freedesktop.org/drm/msm into drm-fixesdrm-fixes-2021-03-26
- pll fixes
- shutdown hook fix
- runtime resume fix
- clear_oob fix
- kms locking fix
- display aux retry fix
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Rob Clark <robdclark@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/CAF6AEGvmiMKRms_NVavD=NA_jbuexZUcqqL35ke7umqpp-TxMw@mail.gmail.com
Diffstat (limited to 'drivers/gpu/drm/msm/dsi/pll/dsi_pll.h')
| -rw-r--r-- | drivers/gpu/drm/msm/dsi/pll/dsi_pll.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/msm/dsi/pll/dsi_pll.h b/drivers/gpu/drm/msm/dsi/pll/dsi_pll.h index 3405982a092c..bbecb1de5678 100644 --- a/drivers/gpu/drm/msm/dsi/pll/dsi_pll.h +++ b/drivers/gpu/drm/msm/dsi/pll/dsi_pll.h @@ -117,10 +117,12 @@ msm_dsi_pll_10nm_init(struct platform_device *pdev, int id) } #endif #ifdef CONFIG_DRM_MSM_DSI_7NM_PHY -struct msm_dsi_pll *msm_dsi_pll_7nm_init(struct platform_device *pdev, int id); +struct msm_dsi_pll *msm_dsi_pll_7nm_init(struct platform_device *pdev, + enum msm_dsi_phy_type type, int id); #else static inline struct msm_dsi_pll * -msm_dsi_pll_7nm_init(struct platform_device *pdev, int id) +msm_dsi_pll_7nm_init(struct platform_device *pdev, + enum msm_dsi_phy_type type, int id) { return ERR_PTR(-ENODEV); } |