| Message ID | 1677774797-31063-1-git-send-email-quic_vpolimer@quicinc.com (mailing list archive) |
|---|---|
| Headers | show |
| Series | Add PSR support for eDP | expand |
Hi, On Thu, Mar 2, 2023 at 8:33 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. > > Changes in v7: > - Add fix for underrun issue on kasan build. > > Changes in v8: > - Drop the enc spinlock as it won't serve any purpose in > protetcing conn state.(Dmitry/Doug) > > Changes in v9: > - Update commit message and fix alignment using spaces.(Marijn) > - Misc changes.(Marijn) > > Changes in v10: > - Get crtc cached in dpu_enc during obj init.(Dmitry) > > Changes in v11: > - Remove crtc cached in dpu_enc during obj init. > - Update dpu_enc crtc state on crtc enable/disable during self refresh. > > Changes in v12: > - Update sc7180 intf mask to get intf timing gen status > based on DPU_INTF_STATUS_SUPPORTED bit.(Dmitry) > - Remove "clear active interface in the datapath cleanup" change > as it is already included. > > Changes in v13: > - Move core changes to top of the series.(Dmitry) > - Drop self refresh aware disable change after psr entry.(Dmitry) > > Changes in v14: > - Set self_refresh_aware for the PSR to kick in. > > Vinod Polimera (14): > drm: add helper functions to retrieve old and new crtc > drm/bridge: use atomic enable/disable callbacks for panel bridge > drm/bridge: add psr support for panel bridge callbacks > drm/msm/disp/dpu: check for crtc enable rather than crtc active to > release shared resources > drm/msm/disp/dpu: get timing engine status from intf status register > drm/msm/disp/dpu: wait for extra vsync till timing engine status is > disabled > drm/msm/disp/dpu: reset the datapath after timing engine disable > 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/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: update dpu_enc crtc state on crtc enable/disable > during self refresh > drm/msm/dp: set self refresh aware based on psr support > > drivers/gpu/drm/bridge/panel.c | 68 +++++++- > drivers/gpu/drm/drm_atomic.c | 60 +++++++ > drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 40 ++++- > drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 26 +++- > .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 22 +++ > drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 3 +- > drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 12 +- > drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c | 8 +- > drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 2 +- > drivers/gpu/drm/msm/dp/dp_catalog.c | 80 ++++++++++ > drivers/gpu/drm/msm/dp/dp_catalog.h | 4 + > drivers/gpu/drm/msm/dp/dp_ctrl.c | 80 ++++++++++ > drivers/gpu/drm/msm/dp/dp_ctrl.h | 3 + > drivers/gpu/drm/msm/dp/dp_display.c | 36 +++-- > drivers/gpu/drm/msm/dp/dp_display.h | 2 + > drivers/gpu/drm/msm/dp/dp_drm.c | 173 ++++++++++++++++++++- > 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 + > 22 files changed, 683 insertions(+), 43 deletions(-) I put these patches on top of msm-next. With that, I was at least able to see the PSR transition function being called by: echo "dp_catalog_ctrl_set_psr" > /sys/kernel/debug/tracing/set_ftrace_filter echo function > /sys/kernel/debug/tracing/current_tracer echo 1 > /sys/kernel/debug/tracing/tracing_on cat /sys/kernel/debug/tracing/trace_pipe I didn't do anything to actually confirm that the panel was in PSR mode nor that power savings are happening, but at least I can confirm that the function is being called again (AKA the fix from v13 to v14 seems to have worked). --- I also backported these to chromeos-5.15 and let a hoglin device sit there on my desk for a few hours with the cursor blinking to see if I could see any of the "flickers" that I saw before. I was running a KASAN build and forcing cpus to the lowest frequencies: echo userspace > /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor cat /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_min_freq > \ /sys/devices/system/cpu/cpu0/cpufreq/scaling_setspeed echo userspace > /sys/devices/system/cpu/cpu4/cpufreq/scaling_governor cat /sys/devices/system/cpu/cpu4/cpufreq/cpuinfo_min_freq > \ /sys/devices/system/cpu/cpu4/cpufreq/scaling_setspeed echo userspace > /sys/devices/system/cpu/cpu7/cpufreq/scaling_governor cat /sys/devices/system/cpu/cpu7/cpufreq/cpuinfo_min_freq > \ /sys/devices/system/cpu/cpu7/cpufreq/scaling_setspeed I did manage to see the screen flicker once over a period of an hour or two. That's not terribly surprising because of the changes in v13 which dropped your previous fix for this. I'll look forward to seeing a future patch to fix this in the core. --- In any case, with all the caveats mentioned above, I'm OK with: Tested-by: Douglas Anderson <dianders@chromium.org>
David, Daniel & other drm maintainers, On 02/03/2023 18:33, Vinod Polimera wrote: [skipped the changelog] > Vinod Polimera (14): > drm: add helper functions to retrieve old and new crtc > drm/bridge: use atomic enable/disable callbacks for panel bridge > drm/bridge: add psr support for panel bridge callbacks The first three patches are generic. How do we merge this series? I think these three patches should be merged into an immutable branch at drm-misc (or any other drm tree), which we can then merge into msm-next. What do you think? > drm/msm/disp/dpu: check for crtc enable rather than crtc active to > release shared resources > drm/msm/disp/dpu: get timing engine status from intf status register > drm/msm/disp/dpu: wait for extra vsync till timing engine status is > disabled > drm/msm/disp/dpu: reset the datapath after timing engine disable > 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/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: update dpu_enc crtc state on crtc enable/disable > during self refresh > drm/msm/dp: set self refresh aware based on psr support > > drivers/gpu/drm/bridge/panel.c | 68 +++++++- > drivers/gpu/drm/drm_atomic.c | 60 +++++++ > drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 40 ++++- > drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 26 +++- > .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 22 +++ > drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 3 +- > drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 12 +- > drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c | 8 +- > drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 2 +- > drivers/gpu/drm/msm/dp/dp_catalog.c | 80 ++++++++++ > drivers/gpu/drm/msm/dp/dp_catalog.h | 4 + > drivers/gpu/drm/msm/dp/dp_ctrl.c | 80 ++++++++++ > drivers/gpu/drm/msm/dp/dp_ctrl.h | 3 + > drivers/gpu/drm/msm/dp/dp_display.c | 36 +++-- > drivers/gpu/drm/msm/dp/dp_display.h | 2 + > drivers/gpu/drm/msm/dp/dp_drm.c | 173 ++++++++++++++++++++- > 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 + > 22 files changed, 683 insertions(+), 43 deletions(-) >
On Thu, 02 Mar 2023 22:03:03 +0530, Vinod Polimera 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. > > [...] Applied, thanks! [01/14] drm: add helper functions to retrieve old and new crtc https://gitlab.freedesktop.org/lumag/msm/-/commit/ef708af6054c [02/14] drm/bridge: use atomic enable/disable callbacks for panel bridge https://gitlab.freedesktop.org/lumag/msm/-/commit/49291dbf1cd8 [03/14] drm/bridge: add psr support for panel bridge callbacks https://gitlab.freedesktop.org/lumag/msm/-/commit/26966d5bc7dd [04/14] drm/msm/disp/dpu: check for crtc enable rather than crtc active to release shared resources https://gitlab.freedesktop.org/lumag/msm/-/commit/c235a0d4a185 [05/14] drm/msm/disp/dpu: get timing engine status from intf status register https://gitlab.freedesktop.org/lumag/msm/-/commit/15b04e280119 [06/14] drm/msm/disp/dpu: wait for extra vsync till timing engine status is disabled https://gitlab.freedesktop.org/lumag/msm/-/commit/b2afc29853c3 [07/14] drm/msm/disp/dpu: reset the datapath after timing engine disable https://gitlab.freedesktop.org/lumag/msm/-/commit/392a21678a7f [08/14] drm/msm/dp: use atomic callbacks for DP bridge ops https://gitlab.freedesktop.org/lumag/msm/-/commit/20536d1c512b [09/14] drm/msm/dp: Add basic PSR support for eDP https://gitlab.freedesktop.org/lumag/msm/-/commit/c0b993bbfe9e [10/14] drm/msm/dp: use the eDP bridge ops to validate eDP modes https://gitlab.freedesktop.org/lumag/msm/-/commit/de9512e23adc [11/14] drm/msm/disp/dpu: use atomic enable/disable callbacks for encoder functions https://gitlab.freedesktop.org/lumag/msm/-/commit/f62087459d8a [12/14] drm/msm/disp/dpu: add PSR support for eDP interface in dpu driver https://gitlab.freedesktop.org/lumag/msm/-/commit/1bd583580cba [13/14] drm/msm/disp/dpu: update dpu_enc crtc state on crtc enable/disable during self refresh https://gitlab.freedesktop.org/lumag/msm/-/commit/0f2a8f000c21 [14/14] drm/msm/dp: set self refresh aware based on PSR support https://gitlab.freedesktop.org/lumag/msm/-/commit/0c3f3cfd8ef2 Best regards,
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. Changes in v7: - Add fix for underrun issue on kasan build. Changes in v8: - Drop the enc spinlock as it won't serve any purpose in protetcing conn state.(Dmitry/Doug) Changes in v9: - Update commit message and fix alignment using spaces.(Marijn) - Misc changes.(Marijn) Changes in v10: - Get crtc cached in dpu_enc during obj init.(Dmitry) Changes in v11: - Remove crtc cached in dpu_enc during obj init. - Update dpu_enc crtc state on crtc enable/disable during self refresh. Changes in v12: - Update sc7180 intf mask to get intf timing gen status based on DPU_INTF_STATUS_SUPPORTED bit.(Dmitry) - Remove "clear active interface in the datapath cleanup" change as it is already included. Changes in v13: - Move core changes to top of the series.(Dmitry) - Drop self refresh aware disable change after psr entry.(Dmitry) Changes in v14: - Set self_refresh_aware for the PSR to kick in. Vinod Polimera (14): drm: add helper functions to retrieve old and new crtc drm/bridge: use atomic enable/disable callbacks for panel bridge drm/bridge: add psr support for panel bridge callbacks drm/msm/disp/dpu: check for crtc enable rather than crtc active to release shared resources drm/msm/disp/dpu: get timing engine status from intf status register drm/msm/disp/dpu: wait for extra vsync till timing engine status is disabled drm/msm/disp/dpu: reset the datapath after timing engine disable 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/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: update dpu_enc crtc state on crtc enable/disable during self refresh drm/msm/dp: set self refresh aware based on psr support drivers/gpu/drm/bridge/panel.c | 68 +++++++- drivers/gpu/drm/drm_atomic.c | 60 +++++++ drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 40 ++++- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 26 +++- .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 22 +++ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 3 +- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 12 +- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c | 8 +- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 2 +- drivers/gpu/drm/msm/dp/dp_catalog.c | 80 ++++++++++ drivers/gpu/drm/msm/dp/dp_catalog.h | 4 + drivers/gpu/drm/msm/dp/dp_ctrl.c | 80 ++++++++++ drivers/gpu/drm/msm/dp/dp_ctrl.h | 3 + drivers/gpu/drm/msm/dp/dp_display.c | 36 +++-- drivers/gpu/drm/msm/dp/dp_display.h | 2 + drivers/gpu/drm/msm/dp/dp_drm.c | 173 ++++++++++++++++++++- 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 + 22 files changed, 683 insertions(+), 43 deletions(-)