| Message ID | 1657544224-10680-1-git-send-email-quic_vpolimer@quicinc.com |
|---|---|
| Headers | show |
| Series | Add PSR support for eDP | expand |
On 11/07/2022 15:57, Vinod Polimera wrote: > According to KMS documentation, The driver must not release any shared > resources if active is set to false but enable still true. > > Fixes: ccc862b957c6 ("drm/msm/dpu: Fix reservation failures in modeset") > Signed-off-by: Vinod Polimera <quic_vpolimer@quicinc.com> Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > --- > drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 2 +- > 1 file changed, 1 insertion(+), 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 5dfb56a..02a71d1 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c > @@ -592,7 +592,7 @@ static int dpu_encoder_virt_atomic_check( > if (drm_atomic_crtc_needs_modeset(crtc_state)) { > dpu_rm_release(global_state, drm_enc); > > - if (!crtc_state->active_changed || crtc_state->active) > + if (!crtc_state->active_changed || crtc_state->enable) > ret = dpu_rm_reserve(&dpu_kms->rm, global_state, > drm_enc, crtc_state, topology); > }
Gentle reminder to review this patch. Thanks, Vinod P. > -----Original Message----- > From: Vinod Polimera <quic_vpolimer@quicinc.com> > Sent: Monday, July 11, 2022 6:27 PM > To: dri-devel@lists.freedesktop.org; linux-arm-msm@vger.kernel.org; > freedreno@lists.freedesktop.org; devicetree@vger.kernel.org > Cc: Vinod Polimera (QUIC) <quic_vpolimer@quicinc.com>; linux- > kernel@vger.kernel.org; robdclark@gmail.com; dianders@chromium.org; > swboyd@chromium.org; Kalyan Thota (QUIC) <quic_kalyant@quicinc.com>; > dmitry.baryshkov@linaro.org; Kuogee Hsieh (QUIC) > <quic_khsieh@quicinc.com>; Vishnuvardhan Prodduturi (QUIC) > <quic_vproddut@quicinc.com>; bjorn.andersson@linaro.org; Aravind > Venkateswaran (QUIC) <quic_aravindh@quicinc.com>; Abhinav Kumar > (QUIC) <quic_abhinavk@quicinc.com>; Sankeerth Billakanti (QUIC) > <quic_sbillaka@quicinc.com> > Subject: [PATCH v6 01/10] drm/msm/disp/dpu: clear dpu_assign_crtc and get > crtc from connector state instead of dpu_enc > > Update crtc retrieval from dpu_enc to dpu_enc connector state, > since new links get set as part of the dpu enc virt mode set. > The dpu_enc->crtc cache is no more needed, hence cleaning it as > part of this change. > > Signed-off-by: Vinod Polimera <quic_vpolimer@quicinc.com> > --- > drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 4 ---- > drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 30 ++++++++++++++---- > ----------- > drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h | 8 -------- > 3 files changed, 14 insertions(+), 28 deletions(-) > > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c > b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c > index b56f777..f91e3d1 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c > @@ -972,7 +972,6 @@ static void dpu_crtc_disable(struct drm_crtc *crtc, > */ > if (dpu_encoder_get_intf_mode(encoder) == > INTF_MODE_VIDEO) > release_bandwidth = true; > - dpu_encoder_assign_crtc(encoder, NULL); > } > > /* wait for frame_event_done completion */ > @@ -1042,9 +1041,6 @@ static void dpu_crtc_enable(struct drm_crtc *crtc, > trace_dpu_crtc_enable(DRMID(crtc), true, dpu_crtc); > dpu_crtc->enabled = true; > > - drm_for_each_encoder_mask(encoder, crtc->dev, crtc->state- > >encoder_mask) > - dpu_encoder_assign_crtc(encoder, crtc); > - > /* Enable/restore vblank irq handling */ > drm_crtc_vblank_on(crtc); > } > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c > b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c > index 52516eb..0fddc9d 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c > @@ -181,7 +181,6 @@ struct dpu_encoder_virt { > > bool intfs_swapped; > > - struct drm_crtc *crtc; > struct drm_connector *connector; > > struct dentry *debugfs_root; > @@ -1245,6 +1244,7 @@ static void dpu_encoder_vblank_callback(struct > drm_encoder *drm_enc, > struct dpu_encoder_phys *phy_enc) > { > struct dpu_encoder_virt *dpu_enc = NULL; > + struct drm_crtc *crtc; > unsigned long lock_flags; > > if (!drm_enc || !phy_enc) > @@ -1253,9 +1253,14 @@ static void dpu_encoder_vblank_callback(struct > drm_encoder *drm_enc, > DPU_ATRACE_BEGIN("encoder_vblank_callback"); > dpu_enc = to_dpu_encoder_virt(drm_enc); > > + if (!dpu_enc->connector || !dpu_enc->connector->state) > + return; > + > + crtc = dpu_enc->connector->state->crtc; > + > spin_lock_irqsave(&dpu_enc->enc_spinlock, lock_flags); > - if (dpu_enc->crtc) > - dpu_crtc_vblank_callback(dpu_enc->crtc); > + if (crtc) > + dpu_crtc_vblank_callback(crtc); > spin_unlock_irqrestore(&dpu_enc->enc_spinlock, lock_flags); > > atomic_inc(&phy_enc->vsync_cnt); > @@ -1280,29 +1285,22 @@ static void > dpu_encoder_underrun_callback(struct drm_encoder *drm_enc, > DPU_ATRACE_END("encoder_underrun_callback"); > } > > -void dpu_encoder_assign_crtc(struct drm_encoder *drm_enc, struct > drm_crtc *crtc) > -{ > - struct dpu_encoder_virt *dpu_enc = > to_dpu_encoder_virt(drm_enc); > - unsigned long lock_flags; > - > - spin_lock_irqsave(&dpu_enc->enc_spinlock, lock_flags); > - /* crtc should always be cleared before re-assigning */ > - WARN_ON(crtc && dpu_enc->crtc); > - dpu_enc->crtc = crtc; > - spin_unlock_irqrestore(&dpu_enc->enc_spinlock, lock_flags); > -} > - > void dpu_encoder_toggle_vblank_for_crtc(struct drm_encoder *drm_enc, > struct drm_crtc *crtc, bool enable) > { > struct dpu_encoder_virt *dpu_enc = > to_dpu_encoder_virt(drm_enc); > + struct drm_crtc *new_crtc; > unsigned long lock_flags; > int i; > > trace_dpu_enc_vblank_cb(DRMID(drm_enc), enable); > > + if (!dpu_enc->connector || !dpu_enc->connector->state) > + return; > + > + new_crtc = dpu_enc->connector->state->crtc; > spin_lock_irqsave(&dpu_enc->enc_spinlock, lock_flags); > - if (dpu_enc->crtc != crtc) { > + if (!new_crtc || new_crtc != crtc) { > spin_unlock_irqrestore(&dpu_enc->enc_spinlock, > lock_flags); > return; > } > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h > b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h > index 781d41c..edba815 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h > @@ -39,14 +39,6 @@ struct msm_display_info { > }; > > /** > - * dpu_encoder_assign_crtc - Link the encoder to the crtc it's assigned to > - * @encoder: encoder pointer > - * @crtc: crtc pointer > - */ > -void dpu_encoder_assign_crtc(struct drm_encoder *encoder, > - struct drm_crtc *crtc); > - > -/** > * dpu_encoder_toggle_vblank_for_crtc - Toggles vblank interrupts on or off > if > * the encoder is assigned to the given crtc > * @encoder: encoder pointer > -- > 2.7.4
Hi, On Mon, Jul 11, 2022 at 5:57 AM Vinod Polimera <quic_vpolimer@quicinc.com> wrote: > > Changes in v2: > - Use dp bridge to set psr entry/exit instead of dpu_enocder. > - Don't modify whitespaces. > - Set self refresh aware from atomic_check. > - Set self refresh aware only if psr is supported. > - Provide a stub for msm_dp_display_set_psr. > - Move dp functions to bridge code. > > Changes in v3: > - Change callback names to reflect atomic interfaces. > - Move bridge callback change to separate patch as suggested by Dmitry. > - Remove psr function declaration from msm_drv.h. > - Set self_refresh_aware flag only if psr is supported. > - Modify the variable names to simpler form. > - Define bit fields for PSR settings. > - Add comments explaining the steps to enter/exit psr. > - Change DRM_INFO to drm_dbg_db. > > Changes in v4: > - Move the get crtc functions to drm_atomic. > - Add atomic functions for DP bridge too. > - Add ternary operator to choose eDP or DP ops. > - Return true/false instead of 1/0. > - mode_valid missing in the eDP bridge ops. > - Move the functions to get crtc into drm_atomic.c. > - Fix compilation issues. > - Remove dpu_assign_crtc and get crtc from drm_enc instead of dpu_enc. > - Check for crtc state enable while reserving resources. > > Changes in v5: > - Move the mode_valid changes into a different patch. > - Complete psr_op_comp only when isr is set. > - Move the DP atomic callback changes to a different patch. > - Get crtc from drm connector state crtc. > - Move to separate patch for check for crtc state enable while > reserving resources. > > Changes in v6: > - Remove crtc from dpu_encoder_virt struct. > - fix crtc check during vblank toggle crtc. > - Misc changes. > > Signed-off-by: Sankeerth Billakanti <quic_sbillaka@quicinc.com> > Signed-off-by: Kalyan Thota <quic_kalyant@quicinc.com> > Signed-off-by: Vinod Polimera <quic_vpolimer@quicinc.com> > > Vinod Polimera (10): > drm/msm/disp/dpu: clear dpu_assign_crtc and get crtc from connector > state instead of dpu_enc > drm: add helper functions to retrieve old and new crtc > drm/msm/dp: use atomic callbacks for DP bridge ops > drm/msm/dp: Add basic PSR support for eDP > drm/msm/dp: use the eDP bridge ops to validate eDP modes > drm/bridge: use atomic enable/disable callbacks for panel bridge > drm/bridge: add psr support for panel bridge callbacks > drm/msm/disp/dpu: use atomic enable/disable callbacks for encoder > functions > drm/msm/disp/dpu: add PSR support for eDP interface in dpu driver > drm/msm/disp/dpu: check for crtc enable rather than crtc active to > release shared resources > > drivers/gpu/drm/bridge/panel.c | 68 ++++++++-- > drivers/gpu/drm/drm_atomic.c | 60 +++++++++ > drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 17 ++- > drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 56 +++++---- > drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h | 8 -- > drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 2 +- > drivers/gpu/drm/msm/dp/dp_catalog.c | 81 ++++++++++++ > drivers/gpu/drm/msm/dp/dp_catalog.h | 4 + > drivers/gpu/drm/msm/dp/dp_ctrl.c | 73 +++++++++++ > drivers/gpu/drm/msm/dp/dp_ctrl.h | 3 + > drivers/gpu/drm/msm/dp/dp_display.c | 31 +++-- > drivers/gpu/drm/msm/dp/dp_display.h | 2 + > drivers/gpu/drm/msm/dp/dp_drm.c | 184 ++++++++++++++++++++++++++-- > drivers/gpu/drm/msm/dp/dp_drm.h | 9 +- > drivers/gpu/drm/msm/dp/dp_link.c | 36 ++++++ > drivers/gpu/drm/msm/dp/dp_panel.c | 22 ++++ > drivers/gpu/drm/msm/dp/dp_panel.h | 6 + > drivers/gpu/drm/msm/dp/dp_reg.h | 27 ++++ > include/drm/drm_atomic.h | 7 ++ > 19 files changed, 631 insertions(+), 65 deletions(-) I spent some time looking at the first few patches. I can try to look at more later this week, though (as you've noticed) many of my reviews are more nit-picks because I don't really have experience with PSR and my overall knowledge of the Qualcomm DP driver is pretty weak. I tried to at least pick to give a Tested-by, but when I did that it didn't work flawlessly. I picked this series to the chromeos-5.15 tree, which is pretty close to mainline right now. I left it sitting at a screen with a blinking cursor which pretty much means it's always transitioning into and out of PSR. I've seen several glitches on the screen with the series applied. :( No idea what's wrong--that's just me black-box testing. I did try to add debug printouts to see if we were hitting "PSR_UPDATE_ERROR_INT | PSR_WAKE_ERROR_INT" but I didn't see my printouts... FWIW: I'm running with KASAN enabled which could affect timings... Glitches happen every few minutes or so for me and so far I haven't see any glitches without KASAN, but that could just be chance... -Doug
On Fri, 29 Jul 2022 at 02:22, Doug Anderson <dianders@chromium.org> wrote: > > Hi, > > On Mon, Jul 11, 2022 at 5:57 AM Vinod Polimera > <quic_vpolimer@quicinc.com> wrote: > > > > Changes in v2: > > - Use dp bridge to set psr entry/exit instead of dpu_enocder. > > - Don't modify whitespaces. > > - Set self refresh aware from atomic_check. > > - Set self refresh aware only if psr is supported. > > - Provide a stub for msm_dp_display_set_psr. > > - Move dp functions to bridge code. > > > > Changes in v3: > > - Change callback names to reflect atomic interfaces. > > - Move bridge callback change to separate patch as suggested by Dmitry. > > - Remove psr function declaration from msm_drv.h. > > - Set self_refresh_aware flag only if psr is supported. > > - Modify the variable names to simpler form. > > - Define bit fields for PSR settings. > > - Add comments explaining the steps to enter/exit psr. > > - Change DRM_INFO to drm_dbg_db. > > > > Changes in v4: > > - Move the get crtc functions to drm_atomic. > > - Add atomic functions for DP bridge too. > > - Add ternary operator to choose eDP or DP ops. > > - Return true/false instead of 1/0. > > - mode_valid missing in the eDP bridge ops. > > - Move the functions to get crtc into drm_atomic.c. > > - Fix compilation issues. > > - Remove dpu_assign_crtc and get crtc from drm_enc instead of dpu_enc. > > - Check for crtc state enable while reserving resources. > > > > Changes in v5: > > - Move the mode_valid changes into a different patch. > > - Complete psr_op_comp only when isr is set. > > - Move the DP atomic callback changes to a different patch. > > - Get crtc from drm connector state crtc. > > - Move to separate patch for check for crtc state enable while > > reserving resources. > > > > Changes in v6: > > - Remove crtc from dpu_encoder_virt struct. > > - fix crtc check during vblank toggle crtc. > > - Misc changes. > > > > Signed-off-by: Sankeerth Billakanti <quic_sbillaka@quicinc.com> > > Signed-off-by: Kalyan Thota <quic_kalyant@quicinc.com> > > Signed-off-by: Vinod Polimera <quic_vpolimer@quicinc.com> > > > > Vinod Polimera (10): > > drm/msm/disp/dpu: clear dpu_assign_crtc and get crtc from connector > > state instead of dpu_enc > > drm: add helper functions to retrieve old and new crtc > > drm/msm/dp: use atomic callbacks for DP bridge ops > > drm/msm/dp: Add basic PSR support for eDP > > drm/msm/dp: use the eDP bridge ops to validate eDP modes > > drm/bridge: use atomic enable/disable callbacks for panel bridge > > drm/bridge: add psr support for panel bridge callbacks > > drm/msm/disp/dpu: use atomic enable/disable callbacks for encoder > > functions > > drm/msm/disp/dpu: add PSR support for eDP interface in dpu driver > > drm/msm/disp/dpu: check for crtc enable rather than crtc active to > > release shared resources > > > > drivers/gpu/drm/bridge/panel.c | 68 ++++++++-- > > drivers/gpu/drm/drm_atomic.c | 60 +++++++++ > > drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 17 ++- > > drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 56 +++++---- > > drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h | 8 -- > > drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 2 +- > > drivers/gpu/drm/msm/dp/dp_catalog.c | 81 ++++++++++++ > > drivers/gpu/drm/msm/dp/dp_catalog.h | 4 + > > drivers/gpu/drm/msm/dp/dp_ctrl.c | 73 +++++++++++ > > drivers/gpu/drm/msm/dp/dp_ctrl.h | 3 + > > drivers/gpu/drm/msm/dp/dp_display.c | 31 +++-- > > drivers/gpu/drm/msm/dp/dp_display.h | 2 + > > drivers/gpu/drm/msm/dp/dp_drm.c | 184 ++++++++++++++++++++++++++-- > > drivers/gpu/drm/msm/dp/dp_drm.h | 9 +- > > drivers/gpu/drm/msm/dp/dp_link.c | 36 ++++++ > > drivers/gpu/drm/msm/dp/dp_panel.c | 22 ++++ > > drivers/gpu/drm/msm/dp/dp_panel.h | 6 + > > drivers/gpu/drm/msm/dp/dp_reg.h | 27 ++++ > > include/drm/drm_atomic.h | 7 ++ > > 19 files changed, 631 insertions(+), 65 deletions(-) > Which tree does this series apply to?
Hi, On Thu, Aug 4, 2022 at 9:21 AM Robert Foss <robert.foss@linaro.org> wrote: > > On Fri, 29 Jul 2022 at 02:22, Doug Anderson <dianders@chromium.org> wrote: > > > > Hi, > > > > On Mon, Jul 11, 2022 at 5:57 AM Vinod Polimera > > <quic_vpolimer@quicinc.com> wrote: > > > > > > Changes in v2: > > > - Use dp bridge to set psr entry/exit instead of dpu_enocder. > > > - Don't modify whitespaces. > > > - Set self refresh aware from atomic_check. > > > - Set self refresh aware only if psr is supported. > > > - Provide a stub for msm_dp_display_set_psr. > > > - Move dp functions to bridge code. > > > > > > Changes in v3: > > > - Change callback names to reflect atomic interfaces. > > > - Move bridge callback change to separate patch as suggested by Dmitry. > > > - Remove psr function declaration from msm_drv.h. > > > - Set self_refresh_aware flag only if psr is supported. > > > - Modify the variable names to simpler form. > > > - Define bit fields for PSR settings. > > > - Add comments explaining the steps to enter/exit psr. > > > - Change DRM_INFO to drm_dbg_db. > > > > > > Changes in v4: > > > - Move the get crtc functions to drm_atomic. > > > - Add atomic functions for DP bridge too. > > > - Add ternary operator to choose eDP or DP ops. > > > - Return true/false instead of 1/0. > > > - mode_valid missing in the eDP bridge ops. > > > - Move the functions to get crtc into drm_atomic.c. > > > - Fix compilation issues. > > > - Remove dpu_assign_crtc and get crtc from drm_enc instead of dpu_enc. > > > - Check for crtc state enable while reserving resources. > > > > > > Changes in v5: > > > - Move the mode_valid changes into a different patch. > > > - Complete psr_op_comp only when isr is set. > > > - Move the DP atomic callback changes to a different patch. > > > - Get crtc from drm connector state crtc. > > > - Move to separate patch for check for crtc state enable while > > > reserving resources. > > > > > > Changes in v6: > > > - Remove crtc from dpu_encoder_virt struct. > > > - fix crtc check during vblank toggle crtc. > > > - Misc changes. > > > > > > Signed-off-by: Sankeerth Billakanti <quic_sbillaka@quicinc.com> > > > Signed-off-by: Kalyan Thota <quic_kalyant@quicinc.com> > > > Signed-off-by: Vinod Polimera <quic_vpolimer@quicinc.com> > > > > > > Vinod Polimera (10): > > > drm/msm/disp/dpu: clear dpu_assign_crtc and get crtc from connector > > > state instead of dpu_enc > > > drm: add helper functions to retrieve old and new crtc > > > drm/msm/dp: use atomic callbacks for DP bridge ops > > > drm/msm/dp: Add basic PSR support for eDP > > > drm/msm/dp: use the eDP bridge ops to validate eDP modes > > > drm/bridge: use atomic enable/disable callbacks for panel bridge > > > drm/bridge: add psr support for panel bridge callbacks > > > drm/msm/disp/dpu: use atomic enable/disable callbacks for encoder > > > functions > > > drm/msm/disp/dpu: add PSR support for eDP interface in dpu driver > > > drm/msm/disp/dpu: check for crtc enable rather than crtc active to > > > release shared resources > > > > > > drivers/gpu/drm/bridge/panel.c | 68 ++++++++-- > > > drivers/gpu/drm/drm_atomic.c | 60 +++++++++ > > > drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 17 ++- > > > drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 56 +++++---- > > > drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h | 8 -- > > > drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 2 +- > > > drivers/gpu/drm/msm/dp/dp_catalog.c | 81 ++++++++++++ > > > drivers/gpu/drm/msm/dp/dp_catalog.h | 4 + > > > drivers/gpu/drm/msm/dp/dp_ctrl.c | 73 +++++++++++ > > > drivers/gpu/drm/msm/dp/dp_ctrl.h | 3 + > > > drivers/gpu/drm/msm/dp/dp_display.c | 31 +++-- > > > drivers/gpu/drm/msm/dp/dp_display.h | 2 + > > > drivers/gpu/drm/msm/dp/dp_drm.c | 184 ++++++++++++++++++++++++++-- > > > drivers/gpu/drm/msm/dp/dp_drm.h | 9 +- > > > drivers/gpu/drm/msm/dp/dp_link.c | 36 ++++++ > > > drivers/gpu/drm/msm/dp/dp_panel.c | 22 ++++ > > > drivers/gpu/drm/msm/dp/dp_panel.h | 6 + > > > drivers/gpu/drm/msm/dp/dp_reg.h | 27 ++++ > > > include/drm/drm_atomic.h | 7 ++ > > > 19 files changed, 631 insertions(+), 65 deletions(-) > > > > Which tree does this series apply to? It ought to apply to msm-next, but as I mentioned in my reply to patch #1 it doesn't apply to the top of msm-next. I think I also had to manually apply a few of the later patches with "patch -p1". -Doug