p1 register block is needed for the second mst stream. Add support in the catalog to be able to program this block.
Signed-off-by: Abhinav Kumar <[email protected]> --- drivers/gpu/drm/msm/dp/dp_catalog.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/drivers/gpu/drm/msm/dp/dp_catalog.c b/drivers/gpu/drm/msm/dp/dp_catalog.c index b4c8856fb25d01dd1b30c5ec33ce821aafa9551d..ee7f2d0b23aa034428a01ef2c9752f51013c5e01 100644 --- a/drivers/gpu/drm/msm/dp/dp_catalog.c +++ b/drivers/gpu/drm/msm/dp/dp_catalog.c @@ -73,6 +73,7 @@ struct dss_io_data { struct dss_io_region aux; struct dss_io_region link; struct dss_io_region p0; + struct dss_io_region p1; }; struct msm_dp_catalog_private { @@ -93,6 +94,8 @@ void msm_dp_catalog_snapshot(struct msm_dp_catalog *msm_dp_catalog, struct msm_d msm_disp_snapshot_add_block(disp_state, dss->aux.len, dss->aux.base, "dp_aux"); msm_disp_snapshot_add_block(disp_state, dss->link.len, dss->link.base, "dp_link"); msm_disp_snapshot_add_block(disp_state, dss->p0.len, dss->p0.base, "dp_p0"); + + msm_disp_snapshot_add_block(disp_state, dss->p1.len, dss->p0.base, "dp_p1"); } static inline u32 msm_dp_read_aux(struct msm_dp_catalog_private *catalog, u32 offset) @@ -145,6 +148,26 @@ static inline u32 msm_dp_read_p0(struct msm_dp_catalog_private *catalog, return readl_relaxed(catalog->io.p0.base + offset); } +static inline void msm_dp_write_p1(struct msm_dp_catalog_private *catalog, + u32 offset, u32 data) +{ + /* + * To make sure interface reg writes happens before any other operation, + * this function uses writel() instread of writel_relaxed() + */ + writel(data, catalog->io.p1.base + offset); +} + +static inline u32 msm_dp_read_p1(struct msm_dp_catalog_private *catalog, + u32 offset) +{ + /* + * To make sure interface reg writes happens before any other operation, + * this function uses writel() instread of writel_relaxed() + */ + return readl_relaxed(catalog->io.p1.base + offset); +} + static inline u32 msm_dp_read_link(struct msm_dp_catalog_private *catalog, u32 offset) { return readl_relaxed(catalog->io.link.base + offset); @@ -1137,6 +1160,12 @@ static int msm_dp_catalog_get_io(struct msm_dp_catalog_private *catalog) DRM_ERROR("unable to remap p0 region: %pe\n", dss->p0.base); return PTR_ERR(dss->p0.base); } + + dss->p1.base = msm_dp_ioremap(pdev, 4, &dss->p1.len); + if (IS_ERR(dss->p1.base)) { + DRM_ERROR("unable to remap p1 region: %pe\n", dss->p1.base); + return PTR_ERR(dss->p1.base); + } } return 0; -- 2.34.1
