| Message ID | 20241216-fd-dp-audio-fixup-v4-0-f8d1961cf22f@linaro.org |
|---|---|
| Headers | show |
| Series | drm/msm/dp: perform misc cleanups | expand |
On 12/15/2024 2:44 PM, Dmitry Baryshkov wrote: > Drop obsolete functions to access audio packet headers. The dp_audio.c > now writes them using msm_dp_write_link() directly. > > Reviewed-by: Stephen Boyd <swboyd@chromium.org> > Tested-by: Stephen Boyd <swboyd@chromium.org> # sc7180-trogdor > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > --- > drivers/gpu/drm/msm/dp/dp_audio.c | 2 - > drivers/gpu/drm/msm/dp/dp_catalog.c | 76 ------------------------------------- > drivers/gpu/drm/msm/dp/dp_catalog.h | 24 ------------ > 3 files changed, 102 deletions(-) > Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
On 12/15/2024 2:44 PM, Dmitry Baryshkov wrote: > The dp_audio module doesn't make any use of the passed DP panel > instance. Drop the argument. > > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > --- > drivers/gpu/drm/msm/dp/dp_audio.c | 3 +-- > drivers/gpu/drm/msm/dp/dp_audio.h | 3 --- > drivers/gpu/drm/msm/dp/dp_display.c | 2 +- > 3 files changed, 2 insertions(+), 6 deletions(-) > Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
On 12/15/2024 2:44 PM, Dmitry Baryshkov wrote: > Having I/O regions inside a msm_dp_catalog_private() results in extra > layers of one-line wrappers for accessing the data. Move I/O region base > and size to the globally visible struct msm_dp_catalog. > > Reviewed-by: Stephen Boyd <swboyd@chromium.org> > Tested-by: Stephen Boyd <swboyd@chromium.org> # sc7180-trogdor > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > --- > drivers/gpu/drm/msm/dp/dp_catalog.c | 542 +++++++++++++++--------------------- > drivers/gpu/drm/msm/dp/dp_catalog.h | 12 + > 2 files changed, 232 insertions(+), 322 deletions(-) > For the reminder of this series, please wait for the discussion at [1] to complete. [1] : https://patchwork.freedesktop.org/patch/628449/?series=141074&rev=3
On 12/15/2024 2:44 PM, Dmitry Baryshkov wrote: > There is little point in rereading DP controller revision over and over > again. Read it once, after the first software reset and propagate it to > the dp_panel module. > Good idea, can be posted even separately in front of the catalog rework as it fits in nicely even with current model. > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > --- > drivers/gpu/drm/msm/dp/dp_catalog.c | 13 ------------- > drivers/gpu/drm/msm/dp/dp_catalog.h | 3 --- > drivers/gpu/drm/msm/dp/dp_ctrl.c | 12 +++++++++--- > drivers/gpu/drm/msm/dp/dp_panel.c | 3 +-- > drivers/gpu/drm/msm/dp/dp_panel.h | 1 + > 5 files changed, 11 insertions(+), 21 deletions(-) > > diff --git a/drivers/gpu/drm/msm/dp/dp_catalog.c b/drivers/gpu/drm/msm/dp/dp_catalog.c > index 2992a0df262e9ab167a21a270d1aa8fd1383033d..84adf3a38e4cf0619b15850c31416f1e67049a42 100644 > --- a/drivers/gpu/drm/msm/dp/dp_catalog.c > +++ b/drivers/gpu/drm/msm/dp/dp_catalog.c > @@ -42,19 +42,6 @@ void msm_dp_catalog_snapshot(struct msm_dp_catalog *msm_dp_catalog, struct msm_d > msm_dp_catalog->p0_len, msm_dp_catalog->p0_base, "dp_p0"); > } > > -/** > - * msm_dp_catalog_hw_revision() - retrieve DP hw revision > - * > - * @msm_dp_catalog: DP catalog structure > - * > - * Return: DP controller hw revision > - * > - */ > -u32 msm_dp_catalog_hw_revision(const struct msm_dp_catalog *msm_dp_catalog) > -{ > - return msm_dp_read_ahb(msm_dp_catalog, REG_DP_HW_VERSION); > -} > - > static void __iomem *msm_dp_ioremap(struct platform_device *pdev, int idx, size_t *len) > { > struct resource *res; > diff --git a/drivers/gpu/drm/msm/dp/dp_catalog.h b/drivers/gpu/drm/msm/dp/dp_catalog.h > index 310319619242df5fa0d91c89fbcc477f16c130ea..ddbae0fcf5fc428b2d37cd1eab1d5860a2f11a50 100644 > --- a/drivers/gpu/drm/msm/dp/dp_catalog.h > +++ b/drivers/gpu/drm/msm/dp/dp_catalog.h > @@ -95,9 +95,6 @@ static inline void msm_dp_write_link(struct msm_dp_catalog *msm_dp_catalog, > /* Debug module */ > void msm_dp_catalog_snapshot(struct msm_dp_catalog *msm_dp_catalog, struct msm_disp_state *disp_state); > > -/* DP Controller APIs */ > -u32 msm_dp_catalog_hw_revision(const struct msm_dp_catalog *msm_dp_catalog); > - > struct msm_dp_catalog *msm_dp_catalog_get(struct device *dev); > > #endif /* _DP_CATALOG_H_ */ > diff --git a/drivers/gpu/drm/msm/dp/dp_ctrl.c b/drivers/gpu/drm/msm/dp/dp_ctrl.c > index b15b7ba599e29c4edd746e9c2a8bf2f4a8eedf15..60dbf7eab3fd184bc12035d267abb3758cce9f89 100644 > --- a/drivers/gpu/drm/msm/dp/dp_ctrl.c > +++ b/drivers/gpu/drm/msm/dp/dp_ctrl.c > @@ -131,6 +131,8 @@ struct msm_dp_ctrl_private { > struct completion psr_op_comp; > struct completion video_comp; > > + u32 hw_revision; > + > bool core_clks_on; > bool link_clks_on; > bool stream_clks_on; > @@ -173,6 +175,11 @@ void msm_dp_ctrl_reset(struct msm_dp_ctrl *msm_dp_ctrl) > > sw_reset &= ~DP_SW_RESET; > msm_dp_write_ahb(msm_dp_catalog, REG_DP_SW_RESET, sw_reset); > + > + if (!ctrl->hw_revision) { > + ctrl->hw_revision = msm_dp_read_ahb(msm_dp_catalog, REG_DP_HW_VERSION); > + ctrl->panel->hw_revision = ctrl->hw_revision; > + } > } > > static u32 msm_dp_ctrl_get_aux_interrupt(struct msm_dp_ctrl_private *ctrl) > @@ -307,12 +314,11 @@ static void msm_dp_ctrl_mainlink_disable(struct msm_dp_ctrl_private *ctrl) > static void msm_dp_setup_peripheral_flush(struct msm_dp_ctrl_private *ctrl) > { > struct msm_dp_catalog *msm_dp_catalog = ctrl->catalog; > - u32 mainlink_ctrl, hw_revision; > + u32 mainlink_ctrl; > > mainlink_ctrl = msm_dp_read_link(msm_dp_catalog, REG_DP_MAINLINK_CTRL); > > - hw_revision = msm_dp_catalog_hw_revision(msm_dp_catalog); > - if (hw_revision >= DP_HW_VERSION_1_2) > + if (ctrl->hw_revision >= DP_HW_VERSION_1_2) > mainlink_ctrl |= DP_MAINLINK_FLUSH_MODE_SDE_PERIPH_UPDATE; > else > mainlink_ctrl |= DP_MAINLINK_FLUSH_MODE_UPDATE_SDP; > diff --git a/drivers/gpu/drm/msm/dp/dp_panel.c b/drivers/gpu/drm/msm/dp/dp_panel.c > index 3441c28e3ce332bfe932d7adee7f0ecbaa486c2e..969d618c909876fd7a13aeb6e6c9e117071bc682 100644 > --- a/drivers/gpu/drm/msm/dp/dp_panel.c > +++ b/drivers/gpu/drm/msm/dp/dp_panel.c > @@ -380,9 +380,8 @@ static void msm_dp_panel_send_vsc_sdp(struct msm_dp_panel_private *panel, struct > > static void msm_dp_panel_update_sdp(struct msm_dp_panel_private *panel) > { > - u32 hw_revision; > + u32 hw_revision = panel->msm_dp_panel.hw_revision; > > - hw_revision = msm_dp_catalog_hw_revision(panel->catalog); > if (hw_revision >= DP_HW_VERSION_1_0 && > hw_revision < DP_HW_VERSION_1_2) { > msm_dp_write_link(panel->catalog, MMSS_DP_SDP_CFG3, UPDATE_SDP); > diff --git a/drivers/gpu/drm/msm/dp/dp_panel.h b/drivers/gpu/drm/msm/dp/dp_panel.h > index 8dde55b3a5ab64c0c12d69cb2dd5b5c733c83432..c348417bb07f33efdf1402a73c27ff99e394e5a3 100644 > --- a/drivers/gpu/drm/msm/dp/dp_panel.h > +++ b/drivers/gpu/drm/msm/dp/dp_panel.h > @@ -38,6 +38,7 @@ struct msm_dp_panel { > struct msm_dp_panel_psr psr_cap; > bool video_test; > bool vsc_sdp_supported; > + u32 hw_revision; > > u32 max_dp_lanes; > u32 max_dp_link_rate; >
- Fix register programming in the dp_audio module - Rework most of the register programming functions to be local to the calling module rather than accessing everything through huge dp_catalog monster. Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> --- Changes in v4: - Rebased on top of linux-next + msm-fixes, dropping picked up patches (Abhinav) - Reordered patches to move dp_audio patches earlier (Abhinav). - Added several more patches, dropping dp_catalog.c completely. - Link to v3: https://lore.kernel.org/r/20241212-fd-dp-audio-fixup-v3-0-0b1c65e7dba3@linaro.org Changes in v3: - Fixed falce -> false typo (Abhinav) - Dropped wrong c&p comment from msm_dp_read_p0() (Stephen) - Changed msm_dp_aux_clear_hw_interrupts() to return void (Stephen) - Fixed most of line length warnings - Link to v2: https://lore.kernel.org/r/20241202-fd-dp-audio-fixup-v2-0-d9187ea96dad@linaro.org Changes in v2: - Set safe_to_exit_level before printing it (LKP) - Keep TPG-related functions (Abhinav) - Link to v1: https://lore.kernel.org/r/20241108-fd-dp-audio-fixup-v1-0-40c8eeb60cf5@linaro.org --- Dmitry Baryshkov (16): drm/msm/dp: drop msm_dp_panel_dump_regs() and msm_dp_catalog_dump_regs() drm/msm/dp: use msm_dp_utils_pack_sdp_header() for audio packets drm/msm/dp: drop obsolete audio headers access through catalog drm/msm/dp: drop struct msm_dp_panel_in drm/msm/dp: stop passing panel to msm_dp_audio_get() drm/msm/dp: split MMSS_DP_DSC_DTO register write to a separate function drm/msm/dp: pull I/O data out of msm_dp_catalog_private() drm/msm/dp: move I/O functions to global header drm/msm/dp: move/inline AUX register functions drm/msm/dp: move/inline ctrl register functions drm/msm/dp: move/inline panel related functions drm/msm/dp: move/inline audio related functions drm/msm/dp: move more AUX functions to dp_aux.c drm/msm/dp: move interrupt handling to dp_ctrl drm/msm/dp: read hw revision only once drm/msm/dp: drop the msm_dp_catalog module drivers/gpu/drm/msm/Makefile | 1 - drivers/gpu/drm/msm/dp/dp_audio.c | 379 ++++------ drivers/gpu/drm/msm/dp/dp_audio.h | 8 +- drivers/gpu/drm/msm/dp/dp_aux.c | 216 +++++- drivers/gpu/drm/msm/dp/dp_aux.h | 15 +- drivers/gpu/drm/msm/dp/dp_catalog.c | 1340 ----------------------------------- drivers/gpu/drm/msm/dp/dp_catalog.h | 128 ---- drivers/gpu/drm/msm/dp/dp_ctrl.c | 607 ++++++++++++++-- drivers/gpu/drm/msm/dp/dp_ctrl.h | 19 +- drivers/gpu/drm/msm/dp/dp_debug.c | 1 - drivers/gpu/drm/msm/dp/dp_display.c | 157 ++-- drivers/gpu/drm/msm/dp/dp_link.c | 1 + drivers/gpu/drm/msm/dp/dp_panel.c | 276 +++++++- drivers/gpu/drm/msm/dp/dp_panel.h | 22 +- drivers/gpu/drm/msm/dp/dp_reg.h | 19 + 15 files changed, 1278 insertions(+), 1911 deletions(-) --- base-commit: 952b5ed3020b50205f223e28ab182539210089c7 change-id: 20240615-fd-dp-audio-fixup-a92883ea9e40 Best regards,