| Message ID | 1685464318-25031-3-git-send-email-quic_khsieh@quicinc.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | retrieve DSI DSC through DRM bridge | expand |
On 30/05/2023 19:31, Kuogee Hsieh wrote: > At current implementation, DSI DSC struct is populated at display setup > during system bootup. This mechanism works fine with embedded display. > But will run into problem with plugin/unplug oriented external display, > such as DP, due to DSC struct will become stale once external display > unplugged. New DSC struct has to be re populated to reflect newer external > display which just plugged in. Move retrieving of DSI DSC struct to > atomic_check() so that same mechanism will work for both embedded display > and external plugin/unplug oriented display. > > Signed-off-by: Kuogee Hsieh <quic_khsieh@quicinc.com> > --- > drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 15 ++++++++++++++- > drivers/gpu/drm/msm/msm_drv.h | 6 ++++++ > 2 files changed, 20 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c > index 3b416e1..2927d20 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c > @@ -16,6 +16,8 @@ > #include <drm/drm_crtc.h> > #include <drm/drm_file.h> > #include <drm/drm_probe_helper.h> > +#include <drm/drm_bridge.h> > +#include <drm/drm_fixed.h> > > #include "msm_drv.h" > #include "dpu_kms.h" > @@ -639,6 +641,15 @@ static int dpu_encoder_virt_atomic_check( > } > } > > + if (dpu_enc->disp_info.intf_type == DRM_MODE_ENCODER_DSI) { INTF_DSI > + struct drm_bridge *bridge; > + > + if (!dpu_enc->dsc) { This condition is not correct. We should be updating the DSC even if there is one. > + bridge = drm_bridge_chain_get_first_bridge(drm_enc); > + dpu_enc->dsc = msm_dsi_bridge_get_dsc_config(bridge); This approach will not work for the hot-pluggable outputs. The dpu_enc is not a part of the state. It should not be touched before atomic_commit actually commits changes. Also, I don't think I like the API. It makes it impossible for the driver to check that the bridge is the actually our DSI bridge or not. Once you add DP here, the code will explode. I think instead we should extend the drm_bridge API to be able to get the DSC configuration from it directly. Additional care should be put to design an assymetrical API. Theoretically a drm_bridge can be both DSC source and DSC sink. Imagine a DSI-to-DP or DSI-to-HDMI bridge, supporting DSC on the DSI side too. > + } > + } > + > topology = dpu_encoder_get_topology(dpu_enc, dpu_kms, adj_mode, crtc_state); > > /* > @@ -2121,8 +2132,10 @@ void dpu_encoder_helper_phys_cleanup(struct dpu_encoder_phys *phys_enc) > phys_enc->hw_pp->merge_3d->idx); > } > > - if (dpu_enc->dsc) > + if (dpu_enc->dsc) { > dpu_encoder_unprep_dsc(dpu_enc); > + dpu_enc->dsc = NULL; > + } > > intf_cfg.stream_sel = 0; /* Don't care value for video mode */ > intf_cfg.mode_3d = dpu_encoder_helper_get_3d_blend_mode(phys_enc); > diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h > index e13a8cb..5a7c1f4 100644 > --- a/drivers/gpu/drm/msm/msm_drv.h > +++ b/drivers/gpu/drm/msm/msm_drv.h > @@ -341,6 +341,7 @@ bool msm_dsi_is_cmd_mode(struct msm_dsi *msm_dsi); > bool msm_dsi_is_bonded_dsi(struct msm_dsi *msm_dsi); > bool msm_dsi_is_master_dsi(struct msm_dsi *msm_dsi); > struct drm_dsc_config *msm_dsi_get_dsc_config(struct msm_dsi *msm_dsi); > +struct drm_dsc_config *msm_dsi_bridge_get_dsc_config(struct drm_bridge *bridge); > #else > static inline void __init msm_dsi_register(void) > { > @@ -374,6 +375,11 @@ static inline struct drm_dsc_config *msm_dsi_get_dsc_config(struct msm_dsi *msm_ > { > return NULL; > } > + > +struct drm_dsc_config *msm_dsi_bridge_get_dsc_config(struct drm_bridge *bridge) > +{ > + return NULL; > +} These two chunks belong to the previous patch. > #endif > > #ifdef CONFIG_DRM_MSM_DP
>> + if (dpu_enc->disp_info.intf_type == DRM_MODE_ENCODER_DSI) { > > INTF_DSI > >> + struct drm_bridge *bridge; >> + >> + if (!dpu_enc->dsc) { > > This condition is not correct. We should be updating the DSC even if > there is one. > >> + bridge = drm_bridge_chain_get_first_bridge(drm_enc); >> + dpu_enc->dsc = msm_dsi_bridge_get_dsc_config(bridge); > > This approach will not work for the hot-pluggable outputs. The dpu_enc > is not a part of the state. It should not be touched before > atomic_commit actually commits changes. where can drm_dsc_config be stored? > > Also, I don't think I like the API. It makes it impossible for the > driver to check that the bridge is the actually our DSI bridge or not. > Once you add DP here, the code will explode. > > I think instead we should extend the drm_bridge API to be able to get > the DSC configuration from it directly. Additional care should be put > to design an assymetrical API. Theoretically a drm_bridge can be both > DSC source and DSC sink. Imagine a DSI-to-DP or DSI-to-HDMI bridge, > supporting DSC on the DSI side too. Form my understanding, a bridge contains two interfaces. Therefore I would think only one bridge for dsi-to-dp bridge? and this bridge should represent the bridge chip? I am thinking adding an ops function, get_bridge_dsc() to struct drm_bridge_funcs to retrieve drm_dsc_config. Do you have other suggestion? >
On Wed, 31 May 2023 at 18:41, Kuogee Hsieh <quic_khsieh@quicinc.com> wrote: > > > > >> + if (dpu_enc->disp_info.intf_type == DRM_MODE_ENCODER_DSI) { > > > > INTF_DSI > > > >> + struct drm_bridge *bridge; > >> + > >> + if (!dpu_enc->dsc) { > > > > This condition is not correct. We should be updating the DSC even if > > there is one. > > > >> + bridge = drm_bridge_chain_get_first_bridge(drm_enc); > >> + dpu_enc->dsc = msm_dsi_bridge_get_dsc_config(bridge); > > > > This approach will not work for the hot-pluggable outputs. The dpu_enc > > is not a part of the state. It should not be touched before > > atomic_commit actually commits changes. > where can drm_dsc_config be stored? I'd say, get it during atomic_check (and don't store it anywhere). Then get it during atomic_enable (and save in dpu_enc). > > > > Also, I don't think I like the API. It makes it impossible for the > > driver to check that the bridge is the actually our DSI bridge or not. > > Once you add DP here, the code will explode. > > > > I think instead we should extend the drm_bridge API to be able to get > > the DSC configuration from it directly. Additional care should be put > > to design an assymetrical API. Theoretically a drm_bridge can be both > > DSC source and DSC sink. Imagine a DSI-to-DP or DSI-to-HDMI bridge, > > supporting DSC on the DSI side too. > > Form my understanding, a bridge contains two interfaces. > > Therefore I would think only one bridge for dsi-to-dp bridge? and this > bridge should represent the bridge chip? > > I am thinking adding an ops function, get_bridge_dsc() to struct > drm_bridge_funcs to retrieve drm_dsc_config. So, for this DSI-to-DP bridge will get_bridge_dsc() return DSC configuration for the DSI or for the DP side of the bridge? > > Do you have other suggestion? Let me think about it for a few days.
Generic note: please use reply-to-all instead of any other options to answer the email. You have dropped all recipients (except the freedreno@) in the message <d1a320c4-d851-ba75-ef7b-80dc369d1cfd@quicinc.com> (and it was left unnoticed). On Fri, 2 Jun 2023 at 20:00, Kuogee Hsieh <quic_khsieh@quicinc.com> wrote: > >> There is one option which is keep current > >> > >> 1) keep struct drm_dsc_config *msm_dsi_get_dsc_config(struct msm_dsi > >> *msm_dsi) at dsi.c > >> > >> 2) use struct msm_display_info *disp_info saved at dpu_enc to locate > >> struct msm_dsi from priv->dsi[] list (see item #3) > >> > >> 3) info.dsc = msm_dsi_get_dsc_config(priv->dsi[info.h_tile_instance[0]]); > >> > >> 4) ballistically, keep original code but move info.dsc = > >> msm_dsi_get_dsc_config(priv->dsi[i]); to other place sush as > >> atomic_check() and atomic_enable(). > >> > > 5) leave drm_dsc_config handling as is, update the dsc config from the > > DP driver as suitable. If DSC is not supported, set > > dsc->dsc_version_major = 0 and dsc->dsc_version_minor = 0 on the DP > > side. In DPU driver verify that dsc->dsc_version_major/_minor != 0. > > I am confusing with item 5) > > Currently, msm_dsi_get_dsc_config() of dsi side return dsc pointer if > dsc enabled and NULL if dsc not enabled. > > Should checking dsc == NULL is good enough to differentiate between dsc > is supported and not supported? This is called a "shared memory area". Instead of either providing a dynamic data pointer, one can provide a pointer to the static area which is filled by DP or DSI. If there is no DSC available, one flags 'data not valid' by setting major,minor to 0. > > Why need to set both dsc->dsc_version_major = 0 and > dsc->dsc_version_minor = 0 for dsc is not supported? 6) Another option (which is more in style of what is done in the vendor kernel, if I'm not mistaken): Enhance struct drm_display_mode to contain a pointer to the DSC config. Use this pointer to check whether DSC should be enabled for the particular mode or not. The panels with the static DSC configuration can use a static data pointer.
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c index 3b416e1..2927d20 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c @@ -16,6 +16,8 @@ #include <drm/drm_crtc.h> #include <drm/drm_file.h> #include <drm/drm_probe_helper.h> +#include <drm/drm_bridge.h> +#include <drm/drm_fixed.h> #include "msm_drv.h" #include "dpu_kms.h" @@ -639,6 +641,15 @@ static int dpu_encoder_virt_atomic_check( } } + if (dpu_enc->disp_info.intf_type == DRM_MODE_ENCODER_DSI) { + struct drm_bridge *bridge; + + if (!dpu_enc->dsc) { + bridge = drm_bridge_chain_get_first_bridge(drm_enc); + dpu_enc->dsc = msm_dsi_bridge_get_dsc_config(bridge); + } + } + topology = dpu_encoder_get_topology(dpu_enc, dpu_kms, adj_mode, crtc_state); /* @@ -2121,8 +2132,10 @@ void dpu_encoder_helper_phys_cleanup(struct dpu_encoder_phys *phys_enc) phys_enc->hw_pp->merge_3d->idx); } - if (dpu_enc->dsc) + if (dpu_enc->dsc) { dpu_encoder_unprep_dsc(dpu_enc); + dpu_enc->dsc = NULL; + } intf_cfg.stream_sel = 0; /* Don't care value for video mode */ intf_cfg.mode_3d = dpu_encoder_helper_get_3d_blend_mode(phys_enc); diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h index e13a8cb..5a7c1f4 100644 --- a/drivers/gpu/drm/msm/msm_drv.h +++ b/drivers/gpu/drm/msm/msm_drv.h @@ -341,6 +341,7 @@ bool msm_dsi_is_cmd_mode(struct msm_dsi *msm_dsi); bool msm_dsi_is_bonded_dsi(struct msm_dsi *msm_dsi); bool msm_dsi_is_master_dsi(struct msm_dsi *msm_dsi); struct drm_dsc_config *msm_dsi_get_dsc_config(struct msm_dsi *msm_dsi); +struct drm_dsc_config *msm_dsi_bridge_get_dsc_config(struct drm_bridge *bridge); #else static inline void __init msm_dsi_register(void) { @@ -374,6 +375,11 @@ static inline struct drm_dsc_config *msm_dsi_get_dsc_config(struct msm_dsi *msm_ { return NULL; } + +struct drm_dsc_config *msm_dsi_bridge_get_dsc_config(struct drm_bridge *bridge) +{ + return NULL; +} #endif #ifdef CONFIG_DRM_MSM_DP
At current implementation, DSI DSC struct is populated at display setup during system bootup. This mechanism works fine with embedded display. But will run into problem with plugin/unplug oriented external display, such as DP, due to DSC struct will become stale once external display unplugged. New DSC struct has to be re populated to reflect newer external display which just plugged in. Move retrieving of DSI DSC struct to atomic_check() so that same mechanism will work for both embedded display and external plugin/unplug oriented display. Signed-off-by: Kuogee Hsieh <quic_khsieh@quicinc.com> --- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 15 ++++++++++++++- drivers/gpu/drm/msm/msm_drv.h | 6 ++++++ 2 files changed, 20 insertions(+), 1 deletion(-)