drm/msm: Use atomic helpers for PM suspend/resume
v3 cover drm/msm: Use atomic helpers for PM suspend/resume
Patches 1-2: Changes msm_pm_resume implementation to use atomic helpers and
removes the previously used dpu_kms_pm_suspend/resume functions. Patches 3-4: Removes reliance on knowledge about suspend state from crtc and removes dpu_crtc_reset in favour of the atomic helper.
v2: Reorganized patch ordering, added removal of suspend state reliance
v3: Condesed suspend state reliance patches into one patch (patch 3), added removal of dpu_crtc_reset
Bruce Wang (4):
drm/msm/dpu: Remove dpu_kms_pm_suspend/resume drm/msm: Cut dpu_kms hooks from msm_pm_suspend/resume drm/msm/dpu: Remove suspend state tracking from crtc drm/msm/dpu: Replace dpu_crtc_reset by atomic helper
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 87 +-------------- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h | 2 - drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 123 ---------------------- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 31 ------ drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h | 15 +-- drivers/gpu/drm/msm/msm_drv.c | 27 +++-- drivers/gpu/drm/msm/msm_kms.h | 3 - 7 files changed, 19 insertions(+), 269 deletions(-)
Signature · 6 lines
2.19.0.605.g01d371f741-goog _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
A message that is not in the archive (sent off-list or not yet received): 20181005210403.54615-1-bzwang-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org
PATCH v3 1/4 drm/msm/dpu: Remove dpu_kms_pm_suspend/resume
PM resume was crashing during dpu_kms_pm_resume. This patch removes dpu_kms_pm_suspend/resume so that msm_pm_suspend/resume uses the atomic helpers instead (see next patch). This patch also removes dpu_kms_is_suspend_blocked since it is never called.
v2: Reorganized patches in patchset
--- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 123 ------------------------ drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 15 --- 2 files changed, 138 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +0 -123
@@ -709,127 +709,6 @@ static void dpu_kms_destroy(struct msm_kms *kms)_dpu_kms_hw_destroy (dpu_kms); } -static int dpu_kms_pm_suspend (struct device *dev) -{ -struct drm_device *ddev; -struct drm_modeset_acquire_ctx ctx; -struct drm_atomic_state *state; -struct dpu_kms *dpu_kms; -int ret =0 , num_crtcs =0 ; - -if (!dev) -return -EINVAL ; - - ddev =dev_get_drvdata (dev); -if (!ddev || !ddev_to_msm_kms (ddev)) -return -EINVAL ; - - dpu_kms =to_dpu_kms (ddev_to_msm_kms (ddev)); - -/* disable hot-plug polling */ -drm_kms_helper_poll_disable (ddev); - -/* acquire modeset lock(s) */ -drm_modeset_acquire_init (&ctx,0 ); - -retry: -DPU_ATRACE_BEGIN ("kms_pm_suspend" ); - - ret =drm_modeset_lock_all_ctx (ddev, &ctx); -if (ret) - goto unlock; - -/* save current state for resume */ -if (dpu_kms->suspend_state) -drm_atomic_state_put (dpu_kms->suspend_state); - dpu_kms->suspend_state =drm_atomic_helper_duplicate_state (ddev, &ctx); -if (IS_ERR_OR_NULL (dpu_kms->suspend_state)) { -DRM_ERROR ("failed to back up suspend state\n" ); - dpu_kms->suspend_state =NULL ; - goto unlock; - } - -/* create atomic state to disable all CRTCs */ - state =drm_atomic_state_alloc (ddev); -if (IS_ERR_OR_NULL (state)) { -DRM_ERROR ("failed to allocate crtc disable state\n" ); - goto unlock; - } - - state->acquire_ctx = &ctx; - -/* check for nothing to do */ -if (num_crtcs ==0 ) { -DRM_DEBUG ("all crtcs are already in the off state\n" ); -drm_atomic_state_put (state); - goto suspended; - } - -/* commit the "disable all" state */ - ret =drm_atomic_commit (state); -if (ret <0 ) { -DRM_ERROR ("failed to disable crtcs, %d\n" , ret); -drm_atomic_state_put (state); - goto unlock; - } - -suspended: - dpu_kms->suspend_block = true; - -unlock: -if (ret == -EDEADLK ) { -drm_modeset_backoff (&ctx); - goto retry; - } -drm_modeset_drop_locks (&ctx); -drm_modeset_acquire_fini (&ctx); - -DPU_ATRACE_END ("kms_pm_suspend" ); -return 0 ; -} - -static int dpu_kms_pm_resume (struct device *dev) -{ -struct drm_device *ddev; -struct dpu_kms *dpu_kms; -int ret; - -if (!dev) -return -EINVAL ; - - ddev =dev_get_drvdata (dev); -if (!ddev || !ddev_to_msm_kms (ddev)) -return -EINVAL ; - - dpu_kms =to_dpu_kms (ddev_to_msm_kms (ddev)); - -DPU_ATRACE_BEGIN ("kms_pm_resume" ); - -drm_mode_config_reset (ddev); - -drm_modeset_lock_all (ddev); - - dpu_kms->suspend_block = false; - -if (dpu_kms->suspend_state) { - dpu_kms->suspend_state->acquire_ctx = - ddev->mode_config.acquire_ctx; - ret =drm_atomic_commit (dpu_kms->suspend_state); -if (ret <0 ) { -DRM_ERROR ("failed to restore state, %d\n" , ret); -drm_atomic_state_put (dpu_kms->suspend_state); - } - dpu_kms->suspend_state =NULL ; - } -drm_modeset_unlock_all (ddev); - -/* enable hot-plug polling */ -drm_kms_helper_poll_enable (ddev); - -DPU_ATRACE_END ("kms_pm_resume" ); -return 0 ; -} -static void _dpu_kms_set_encoder_mode (struct msm_kms *kms,struct drm_encoder *encoder,bool cmd_mode)
@@ -873,8 +752,6 @@ static const struct msm_kms_funcs kms_funcs = { .check_modified_format = dpu_format_check_modified_format, .get_format = dpu_get_msm_format, .round_pixclk = dpu_kms_round_pixclk, - .pm_suspend = dpu_kms_pm_suspend, - .pm_resume = dpu_kms_pm_resume, .destroy = dpu_kms_destroy, .set_encoder_mode = _dpu_kms_set_encoder_mode,#ifdef CONFIG_DEBUG_FS
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h +0 -15
@@ -137,7 +137,6 @@ struct dpu_kms {/* saved atomic state during system suspend */ struct drm_atomic_state *suspend_state; -bool suspend_block;struct dpu_rm rm;bool rm_init;
@@ -176,20 +175,6 @@ static inline bool dpu_kms_is_suspend_state(struct drm_device *dev)return to_dpu_kms (ddev_to_msm_kms (dev))->suspend_state !=NULL ; } -/** -* dpu_kms_is_suspend_blocked - whether or not commits are blocked due to pm -* suspend status -* @dev: Pointer to drm device -* Return: True if commits should be rejected due to pm suspend -*/ -static inline bool dpu_kms_is_suspend_blocked (struct drm_device *dev) -{ -if (!dpu_kms_is_suspend_state (dev)) -return false; - -return to_dpu_kms (ddev_to_msm_kms (dev))->suspend_block; -} -/** * Debugfs functions - extra helper functions for debugfs support *
Signature · 6 lines
2.19.0.605.g01d371f741-goog _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
PATCH v3 2/4 drm/msm: Cut dpu_kms hooks from msm_pm_suspend/resume
In reply to a message not in the archiveRemoves the traces of the non-atomic helper calls in msm_pm_suspend/resume since we just deleted those functions (see patch 1). Also removes the drm_kms_helper_poll_disable/enable calls, since the DRM_CONNECTOR_POLL_CONNECT flag is never set so periodic polling doesn't happen anyways.
v2: reorganized patch order
v3: made error checks less severe
--- drivers/gpu/drm/msm/msm_drv.c | 27 ++++++++++++--------------- drivers/gpu/drm/msm/msm_kms.h | 3 --- 2 files changed, 12 insertions(+), 18 deletions(-)
drivers/gpu/drm/msm/msm_drv.c +12 -15
@@ -1069,18 +1069,15 @@ static int msm_pm_suspend(struct device *dev) {struct drm_device *ddev =dev_get_drvdata (dev);struct msm_drm_private *priv = ddev->dev_private; -struct msm_kms *kms = priv->kms; - -/* TODO: Use atomic helper suspend/resume */ -if (kms && kms->funcs && kms->funcs->pm_suspend) -return kms->funcs->pm_suspend (dev); -drm_kms_helper_poll_disable (ddev); +if (WARN_ON (priv->pm_state)) +drm_atomic_state_put (priv->pm_state); priv->pm_state =drm_atomic_helper_suspend (ddev);if (IS_ERR (priv->pm_state)) { -drm_kms_helper_poll_enable (ddev); -return PTR_ERR (priv->pm_state); +int ret =PTR_ERR (priv->pm_state); +DRM_ERROR ("Failed to suspend dpu, %d\n" , ret); +return ret; }return 0 ;
@@ -1090,16 +1087,16 @@ static int msm_pm_resume(struct device *dev) {struct drm_device *ddev =dev_get_drvdata (dev);struct msm_drm_private *priv = ddev->dev_private; -struct msm_kms *kms = priv->kms; +int ret; -/* TODO: Use atomic helper suspend/resume */ -if (kms && kms->funcs && kms->funcs->pm_resume) -return kms->funcs->pm_resume (dev); +if (WARN_ON (!priv->pm_state)) +return -ENOENT ; -drm_atomic_helper_resume (ddev, priv->pm_state); -drm_kms_helper_poll_enable (ddev); + ret =drm_atomic_helper_resume (ddev, priv->pm_state); +if (!ret) + priv->pm_state =NULL ; -return 0 ; +return ret; }#endif
drivers/gpu/drm/msm/msm_kms.h +0 -3
@@ -67,9 +67,6 @@ struct msm_kms_funcs {void (*set_encoder_mode)(struct msm_kms *kms,struct drm_encoder *encoder,bool cmd_mode); -/* pm suspend/resume hooks */ -int (*pm_suspend)(struct device *dev); -int (*pm_resume)(struct device *dev);/* cleanup: */ void (*destroy)(struct msm_kms *kms);#ifdef CONFIG_DEBUG_FS
Signature · 6 lines
2.19.0.605.g01d371f741-goog _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
A message that is not in the archive (sent off-list or not yet received): 20181005210403.54615-3-bzwang-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org
Sean Paul
Reviewed-byRe: [PATCH v3 2/4] drm/msm: Cut dpu_kms hooks from msm_pm_suspend/resume
Quoted 10 lines · Bruce Wang
Removes the traces of the non-atomic helper calls in msm_pm_suspend/resume since we just deleted those functions (see patch 1). Also removes the drm_kms_helper_poll_disable/enable calls, since the
DRM_CONNECTOR_POLL_CONNECTflag is never set so periodic polling doesn't happen anyways.v2: reorganized patch order
v3: made error checks less severeSigned-off-by Bruce Wang <[email protected]>
Quoted 74 lines
--- drivers/gpu/drm/msm/msm_drv.c | 27 ++++++++++++--------------- drivers/gpu/drm/msm/msm_kms.h | 3 --- 2 files changed, 12 insertions(+), 18 deletions(-)drivers/gpu/drm/msm/msm_drv.c +12
-15@@ -1069,18 +1069,15 @@ static int msm_pm_suspend(struct device *dev) {struct drm_device *ddev =dev_get_drvdata (dev);struct msm_drm_private *priv = ddev->dev_private; -struct msm_kms *kms = priv->kms; - -/* TODO: Use atomic helper suspend/resume */ -if (kms && kms->funcs && kms->funcs->pm_suspend) -return kms->funcs->pm_suspend (dev); -drm_kms_helper_poll_disable (ddev); +if (WARN_ON (priv->pm_state)) +drm_atomic_state_put (priv->pm_state); priv->pm_state =drm_atomic_helper_suspend (ddev);if (IS_ERR (priv->pm_state)) { -drm_kms_helper_poll_enable (ddev); -return PTR_ERR (priv->pm_state); +int ret =PTR_ERR (priv->pm_state); +DRM_ERROR ("Failed to suspend dpu, %d\n" , ret); +return ret; }return 0 ;@@ -1090,16 +1087,16 @@ static int msm_pm_resume(struct device *dev) {struct drm_device *ddev =dev_get_drvdata (dev);struct msm_drm_private *priv = ddev->dev_private; -struct msm_kms *kms = priv->kms; +int ret; -/* TODO: Use atomic helper suspend/resume */ -if (kms && kms->funcs && kms->funcs->pm_resume) -return kms->funcs->pm_resume (dev); +if (WARN_ON (!priv->pm_state)) +return -ENOENT ; -drm_atomic_helper_resume (ddev, priv->pm_state); -drm_kms_helper_poll_enable (ddev); + ret =drm_atomic_helper_resume (ddev, priv->pm_state); +if (!ret) + priv->pm_state =NULL ; -return 0 ; +return ret; }#endif drivers/gpu/drm/msm/msm_kms.h +0
-3@@ -67,9 +67,6 @@ struct msm_kms_funcs {void (*set_encoder_mode)(struct msm_kms *kms,struct drm_encoder *encoder,bool cmd_mode); -/* pm suspend/resume hooks */ -int (*pm_suspend)(struct device *dev); -int (*pm_resume)(struct device *dev);/* cleanup: */ void (*destroy)(struct msm_kms *kms);#ifdef CONFIG_DEBUG_FS Signature · 1 line
2.19.0.605.g01d371f741-goog
Signature · 5 lines
Sean Paul, Software Engineer, Google / Chromium OS _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
PATCH v3 3/4 drm/msm/dpu: Remove suspend state tracking from crtc
In reply to a message not in the archiveSince drm core's modeset locks serialize atomic commits, we don't need to track whether or not we're in a suspended state from inside the crtc for dpu_crtc_enable/disable. This patch removes the suspend logic from the crtc and removes the relevant tracing from dpu_trace. Since we removed all calls to dpu_kms_is_suspend_state, we can remove that function and the suspend_state field of dpu_kms as well.
v2: added patch to patchset
v3: reworded commit body and moved deletion of dpu_kms_is_suspend_state and suspend_state to this patch
--- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 48 ++--------------------- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h | 2 - drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 16 -------- drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h | 15 +------ 4 files changed, 6 insertions(+), 75 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +4 -44
@@ -815,35 +815,6 @@ static void _dpu_crtc_vblank_enable_no_lock( } } -/** -* _dpu_crtc_set_suspend - notify crtc of suspend enable/disable -* @crtc: Pointer to drm crtc object -* @enable: true to enable suspend, false to indicate resume -*/ -static void _dpu_crtc_set_suspend (struct drm_crtc *crtc,bool enable) -{ -struct dpu_crtc *dpu_crtc =to_dpu_crtc (crtc); - -DRM_DEBUG_KMS ("crtc%d suspend = %d\n" , crtc->base.id, enable); - -mutex_lock (&dpu_crtc->crtc_lock); - -/* -* If the vblank is enabled, release a power reference on suspend -* and take it back during resume (if it is still enabled). -*/ -trace_dpu_crtc_set_suspend (DRMID (&dpu_crtc->base), enable, dpu_crtc); -if (dpu_crtc->suspend == enable) -DPU_DEBUG ("crtc%d suspend already set to %d, ignoring update\n" , - crtc->base.id, enable); -else if (dpu_crtc->enabled && dpu_crtc->vblank_requested) { -_dpu_crtc_vblank_enable_no_lock (dpu_crtc, !enable); - } - - dpu_crtc->suspend = enable; -mutex_unlock (&dpu_crtc->crtc_lock); -} -/** * dpu_crtc_duplicate_state - state duplicate hook * @crtc: Pointer to drm crtc structure
@@ -951,9 +922,6 @@ static void dpu_crtc_disable(struct drm_crtc *crtc)DRM_DEBUG_KMS ("crtc%d\n" , crtc->base.id); -if (dpu_kms_is_suspend_state (crtc->dev)) -_dpu_crtc_set_suspend (crtc, true); -/* Disable/save vblank irq handling */ drm_crtc_vblank_off (crtc);
@@ -966,8 +934,7 @@ static void dpu_crtc_disable(struct drm_crtc *crtc) atomic_read(&dpu_crtc->frame_pending));trace_dpu_crtc_disable (DRMID (crtc), false, dpu_crtc); -if (dpu_crtc->enabled && !dpu_crtc->suspend && - dpu_crtc->vblank_requested) { +if (dpu_crtc->enabled && dpu_crtc->vblank_requested) {_dpu_crtc_vblank_enable_no_lock (dpu_crtc, false); } dpu_crtc->enabled = false;
@@ -1033,8 +1000,7 @@ static void dpu_crtc_enable(struct drm_crtc *crtc,mutex_lock (&dpu_crtc->crtc_lock);trace_dpu_crtc_enable (DRMID (crtc), true, dpu_crtc); -if (!dpu_crtc->enabled && !dpu_crtc->suspend && - dpu_crtc->vblank_requested) { +if (!dpu_crtc->enabled && dpu_crtc->vblank_requested) {_dpu_crtc_vblank_enable_no_lock (dpu_crtc, true); } dpu_crtc->enabled = true;
@@ -1289,17 +1255,11 @@ static int dpu_crtc_atomic_check(struct drm_crtc *crtc,int dpu_crtc_vblank (struct drm_crtc *crtc,bool en) { -struct dpu_crtc *dpu_crtc; - -if (!crtc) { -DPU_ERROR ("invalid crtc\n" ); -return -EINVAL ; - } - dpu_crtc =to_dpu_crtc (crtc); +struct dpu_crtc *dpu_crtc =to_dpu_crtc (crtc);mutex_lock (&dpu_crtc->crtc_lock);trace_dpu_crtc_vblank (DRMID (&dpu_crtc->base), en, dpu_crtc); -if (dpu_crtc->enabled && !dpu_crtc->suspend) { +if (dpu_crtc->enabled) {_dpu_crtc_vblank_enable_no_lock (dpu_crtc, en); } dpu_crtc->vblank_requested = en;
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h +0 -2
@@ -133,7 +133,6 @@ struct dpu_crtc_frame_event {* @play_count : frame count between crtc enable and disable * @vblank_cb_time : ktime at vblank count reset * @vblank_requested : whether the user has requested vblank events -* @suspend : whether or not a suspend operation is in progress * @enabled : whether the DPU CRTC is currently enabled. updated in the * commit-thread, not state-swap time which is earlier, so * safe to make decisions on during VBLANK on/off work
@@ -169,7 +168,6 @@ struct dpu_crtc {u64 play_count;ktime_t vblank_cb_time;bool vblank_requested; -bool suspend;bool enabled;struct list_head feature_list;
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h +0 -16
@@ -135,9 +135,6 @@ struct dpu_kms {struct dpu_core_perf perf; -/* saved atomic state during system suspend */ -struct drm_atomic_state *suspend_state; -struct dpu_rm rm;bool rm_init;
@@ -162,19 +159,6 @@ struct vsync_info {#define ddev_to_msm_kms (D ) ((D) && (D)->dev_private ? \ ((struct msm_drm_private *)((D)->dev_private))->kms : NULL) -/** -* dpu_kms_is_suspend_state - whether or not the system is pm suspended -* @dev: Pointer to drm device -* Return: Suspend status -*/ -static inline bool dpu_kms_is_suspend_state (struct drm_device *dev) -{ -if (!ddev_to_msm_kms (dev)) -return false; - -return to_dpu_kms (ddev_to_msm_kms (dev))->suspend_state !=NULL ; -} -/** * Debugfs functions - extra helper functions for debugfs support *
drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h +2 -13
@@ -749,7 +749,6 @@ TRACE_EVENT(dpu_crtc_vblank_enable, __field( uint32_t, enc_id ) __field( bool, enable ) __field( bool, enabled ) - __field( bool, suspend )__field ( bool, vblank_requested ) ), TP_fast_assign(
@@ -757,15 +756,12 @@ TRACE_EVENT(dpu_crtc_vblank_enable, __entry->enc_id = enc_id; __entry->enable = enable; __entry->enabled = crtc->enabled; - __entry->suspend = crtc->suspend; __entry->vblank_requested = crtc->vblank_requested; ), -TP_printk ("id:%u encoder:%u enable:%s state{enabled:%s suspend:%s " -"vblank_req:%s}" , +TP_printk ("id:%u encoder:%u enable:%s state{enabled:%s vblank_req:%s}" , __entry->drm_id, __entry->enc_id, __entry->enable ?"true" :"false" , __entry->enabled ?"true" :"false" , - __entry->suspend ?"true" :"false" , __entry->vblank_requested ?"true" :"false" ) );
@@ -776,26 +772,19 @@ DECLARE_EVENT_CLASS(dpu_crtc_enable_template, __field( uint32_t, drm_id ) __field( bool, enable ) __field( bool, enabled ) - __field( bool, suspend )__field ( bool, vblank_requested ) ),TP_fast_assign ( __entry->drm_id = drm_id; __entry->enable = enable; __entry->enabled = crtc->enabled; - __entry->suspend = crtc->suspend; __entry->vblank_requested = crtc->vblank_requested; ), -TP_printk ("id:%u enable:%s state{enabled:%s suspend:%s vblank_req:%s}" , +TP_printk ("id:%u enable:%s state{enabled:%s vblank_req:%s}" , __entry->drm_id, __entry->enable ?"true" :"false" , __entry->enabled ?"true" :"false" , - __entry->suspend ?"true" :"false" , __entry->vblank_requested ?"true" :"false" ) ); -DEFINE_EVENT (dpu_crtc_enable_template, dpu_crtc_set_suspend, - TP_PROTO(uint32_t drm_id, bool enable, struct dpu_crtc *crtc), -TP_ARGS (drm_id, enable, crtc) -);DEFINE_EVENT (dpu_crtc_enable_template, dpu_crtc_enable, TP_PROTO(uint32_t drm_id, bool enable, struct dpu_crtc *crtc), TP_ARGS(drm_id, enable, crtc)
Signature · 6 lines
2.19.0.605.g01d371f741-goog _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
A message that is not in the archive (sent off-list or not yet received): 20181005210403.54615-4-bzwang-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org
Sean Paul
Reviewed-byRe: [PATCH v3 3/4] drm/msm/dpu: Remove suspend state tracking from crtc
Quoted 7 lines · Bruce Wang
Since drm core's modeset locks serialize atomic commits, we don't need to track whether or not we're in a suspended state from inside the crtc for dpu_crtc_enable/disable. This patch removes the suspend logic from the crtc and removes the relevant tracing from
dpu_trace. Since we removed all calls todpu_kms_is_suspend_state, we can remove that function and thesuspend_statefield ofdpu_kmsas well.
Quoted 5 lines
v2: added patch to patchset
v3: reworded commit body and moved deletion ofdpu_kms_is_suspend_stateandsuspend_stateto this patchSigned-off-by Bruce Wang <[email protected]>
Quoted 211 lines
--- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 48 ++--------------------- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h | 2 - drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 16 -------- drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h | 15 +------ 4 files changed, 6 insertions(+), 75 deletions(-)drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +4
-44@@ -815,35 +815,6 @@ static void _dpu_crtc_vblank_enable_no_lock( } } -/** -* _dpu_crtc_set_suspend - notify crtc of suspend enable/disable -* @crtc: Pointer to drm crtc object -* @enable: true to enable suspend, false to indicate resume -*/ -static void _dpu_crtc_set_suspend (struct drm_crtc *crtc,bool enable) -{ -struct dpu_crtc *dpu_crtc =to_dpu_crtc (crtc); - -DRM_DEBUG_KMS ("crtc%d suspend = %d\n" , crtc->base.id, enable); - -mutex_lock (&dpu_crtc->crtc_lock); - -/* -* If the vblank is enabled, release a power reference on suspend -* and take it back during resume (if it is still enabled). -*/ -trace_dpu_crtc_set_suspend (DRMID (&dpu_crtc->base), enable, dpu_crtc); -if (dpu_crtc->suspend == enable) -DPU_DEBUG ("crtc%d suspend already set to %d, ignoring update\n" , - crtc->base.id, enable); -else if (dpu_crtc->enabled && dpu_crtc->vblank_requested) { -_dpu_crtc_vblank_enable_no_lock (dpu_crtc, !enable); - } - - dpu_crtc->suspend = enable; -mutex_unlock (&dpu_crtc->crtc_lock); -} -/** * dpu_crtc_duplicate_state - state duplicate hook * @crtc: Pointer to drm crtc structure @@ -951,9 +922,6 @@ static void dpu_crtc_disable(struct drm_crtc *crtc)DRM_DEBUG_KMS ("crtc%d\n" , crtc->base.id); -if (dpu_kms_is_suspend_state (crtc->dev)) -_dpu_crtc_set_suspend (crtc, true); -/* Disable/save vblank irq handling */ drm_crtc_vblank_off (crtc);@@ -966,8 +934,7 @@ static void dpu_crtc_disable(struct drm_crtc *crtc) atomic_read(&dpu_crtc->frame_pending));trace_dpu_crtc_disable (DRMID (crtc), false, dpu_crtc); -if (dpu_crtc->enabled && !dpu_crtc->suspend && - dpu_crtc->vblank_requested) { +if (dpu_crtc->enabled && dpu_crtc->vblank_requested) {_dpu_crtc_vblank_enable_no_lock (dpu_crtc, false); } dpu_crtc->enabled = false;@@ -1033,8 +1000,7 @@ static void dpu_crtc_enable(struct drm_crtc *crtc,mutex_lock (&dpu_crtc->crtc_lock);trace_dpu_crtc_enable (DRMID (crtc), true, dpu_crtc); -if (!dpu_crtc->enabled && !dpu_crtc->suspend && - dpu_crtc->vblank_requested) { +if (!dpu_crtc->enabled && dpu_crtc->vblank_requested) {_dpu_crtc_vblank_enable_no_lock (dpu_crtc, true); } dpu_crtc->enabled = true;@@ -1289,17 +1255,11 @@ static int dpu_crtc_atomic_check(struct drm_crtc *crtc,int dpu_crtc_vblank (struct drm_crtc *crtc,bool en) { -struct dpu_crtc *dpu_crtc; - -if (!crtc) { -DPU_ERROR ("invalid crtc\n" ); -return -EINVAL ; - } - dpu_crtc =to_dpu_crtc (crtc); +struct dpu_crtc *dpu_crtc =to_dpu_crtc (crtc);mutex_lock (&dpu_crtc->crtc_lock);trace_dpu_crtc_vblank (DRMID (&dpu_crtc->base), en, dpu_crtc); -if (dpu_crtc->enabled && !dpu_crtc->suspend) { +if (dpu_crtc->enabled) {_dpu_crtc_vblank_enable_no_lock (dpu_crtc, en); } dpu_crtc->vblank_requested = en;drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h +0
-2@@ -133,7 +133,6 @@ struct dpu_crtc_frame_event {* @play_count : frame count between crtc enable and disable * @vblank_cb_time : ktime at vblank count reset * @vblank_requested : whether the user has requested vblank events -* @suspend : whether or not a suspend operation is in progress * @enabled : whether the DPU CRTC is currently enabled. updated in the * commit-thread, not state-swap time which is earlier, so * safe to make decisions on during VBLANK on/off work @@ -169,7 +168,6 @@ struct dpu_crtc {u64 play_count;ktime_t vblank_cb_time;bool vblank_requested; -bool suspend;bool enabled;struct list_head feature_list;drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h +0
-16@@ -135,9 +135,6 @@ struct dpu_kms {struct dpu_core_perf perf; -/* saved atomic state during system suspend */ -struct drm_atomic_state *suspend_state; -struct dpu_rm rm;bool rm_init;@@ -162,19 +159,6 @@ struct vsync_info {#define ddev_to_msm_kms (D ) ((D) && (D)->dev_private ? \ ((struct msm_drm_private *)((D)->dev_private))->kms : NULL) -/** -* dpu_kms_is_suspend_state - whether or not the system is pm suspended -* @dev: Pointer to drm device -* Return: Suspend status -*/ -static inline bool dpu_kms_is_suspend_state (struct drm_device *dev) -{ -if (!ddev_to_msm_kms (dev)) -return false; - -return to_dpu_kms (ddev_to_msm_kms (dev))->suspend_state !=NULL ; -} -/** * Debugfs functions - extra helper functions for debugfs support * drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h +2
-13@@ -749,7 +749,6 @@ TRACE_EVENT(dpu_crtc_vblank_enable, __field( uint32_t, enc_id ) __field( bool, enable ) __field( bool, enabled ) - __field( bool, suspend )__field ( bool, vblank_requested ) ), TP_fast_assign(@@ -757,15 +756,12 @@ TRACE_EVENT(dpu_crtc_vblank_enable, __entry->enc_id = enc_id; __entry->enable = enable; __entry->enabled = crtc->enabled; - __entry->suspend = crtc->suspend; __entry->vblank_requested = crtc->vblank_requested; ), -TP_printk ("id:%u encoder:%u enable:%s state{enabled:%s suspend:%s " -"vblank_req:%s}" , +TP_printk ("id:%u encoder:%u enable:%s state{enabled:%s vblank_req:%s}" , __entry->drm_id, __entry->enc_id, __entry->enable ?"true" :"false" , __entry->enabled ?"true" :"false" , - __entry->suspend ?"true" :"false" , __entry->vblank_requested ?"true" :"false" ) );@@ -776,26 +772,19 @@ DECLARE_EVENT_CLASS(dpu_crtc_enable_template, __field( uint32_t, drm_id ) __field( bool, enable ) __field( bool, enabled ) - __field( bool, suspend )__field ( bool, vblank_requested ) ),TP_fast_assign ( __entry->drm_id = drm_id; __entry->enable = enable; __entry->enabled = crtc->enabled; - __entry->suspend = crtc->suspend; __entry->vblank_requested = crtc->vblank_requested; ), -TP_printk ("id:%u enable:%s state{enabled:%s suspend:%s vblank_req:%s}" , +TP_printk ("id:%u enable:%s state{enabled:%s vblank_req:%s}" , __entry->drm_id, __entry->enable ?"true" :"false" , __entry->enabled ?"true" :"false" , - __entry->suspend ?"true" :"false" , __entry->vblank_requested ?"true" :"false" ) ); -DEFINE_EVENT (dpu_crtc_enable_template, dpu_crtc_set_suspend, - TP_PROTO(uint32_t drm_id, bool enable, struct dpu_crtc *crtc), -TP_ARGS (drm_id, enable, crtc) -);DEFINE_EVENT (dpu_crtc_enable_template, dpu_crtc_enable, TP_PROTO(uint32_t drm_id, bool enable, struct dpu_crtc *crtc), TP_ARGS(drm_id, enable, crtc)Signature · 1 line
2.19.0.605.g01d371f741-goog
Signature · 5 lines
Sean Paul, Software Engineer, Google / Chromium OS _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
PATCH v3 4/4 drm/msm/dpu: Replace dpu_crtc_reset by atomic helper
In reply to a message not in the archiveSince we removed all suspend logic from the crtc code (see patch 3/4), dpu_crtc_reset does the same things as drm_atomic_helper_crtc_reset, so let's just replace it with a call to the atomic helper.
v3: added patch to patchset
--- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 39 +----------------------- 1 file changed, 1 insertion(+), 38 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +1 -38
@@ -844,43 +844,6 @@ static struct drm_crtc_state *dpu_crtc_duplicate_state(struct drm_crtc *crtc)return &cstate->base; } -/** -* dpu_crtc_reset - reset hook for CRTCs -* Resets the atomic state for @crtc by freeing the state pointer (which might -* be NULL, e.g. at driver load time) and allocating a new empty state object. -* @crtc: Pointer to drm crtc structure -*/ -static void dpu_crtc_reset (struct drm_crtc *crtc) -{ -struct dpu_crtc *dpu_crtc; -struct dpu_crtc_state *cstate; - -if (!crtc) { -DPU_ERROR ("invalid crtc\n" ); -return ; - } - -/* revert suspend actions, if necessary */ -if (dpu_kms_is_suspend_state (crtc->dev)) -_dpu_crtc_set_suspend (crtc, false); - -/* remove previous state, if present */ -if (crtc->state) { -dpu_crtc_destroy_state (crtc, crtc->state); - crtc->state =0 ; - } - - dpu_crtc =to_dpu_crtc (crtc); - cstate =kzalloc (sizeof (*cstate),GFP_KERNEL ); -if (!cstate) { -DPU_ERROR ("failed to allocate state\n" ); -return ; - } - - cstate->base.crtc = crtc; - crtc->state = &cstate->base; -} -static void dpu_crtc_handle_power_event (u32 event_type,void *arg) {struct drm_crtc *crtc = arg;
@@ -1499,7 +1462,7 @@ static const struct drm_crtc_funcs dpu_crtc_funcs = { .set_config = drm_atomic_helper_set_config, .destroy = dpu_crtc_destroy, .page_flip = drm_atomic_helper_page_flip, - .reset = dpu_crtc_reset, + .reset = drm_atomic_helper_crtc_reset, .atomic_duplicate_state = dpu_crtc_duplicate_state, .atomic_destroy_state = dpu_crtc_destroy_state, .late_register = dpu_crtc_late_register,
Signature · 6 lines
2.19.0.605.g01d371f741-goog _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno
A message that is not in the archive (sent off-list or not yet received): 20181005210403.54615-5-bzwang-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org
Sean Paul
Reviewed-byRe: [PATCH v3 4/4] drm/msm/dpu: Replace dpu_crtc_reset by atomic helper
Quoted 7 lines · Bruce Wang
Since we removed all suspend logic from the crtc code (see patch 3/4),
dpu_crtc_resetdoes the same things asdrm_atomic_helper_crtc_reset, so let's just replace it with a call to the atomic helper.v3: added patch to patchset
Signed-off-by Bruce Wang <[email protected]>
Alllllllright!
Quoted 64 lines
--- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 39 +----------------------- 1 file changed, 1 insertion(+), 38 deletions(-)drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +1
-38@@ -844,43 +844,6 @@ static struct drm_crtc_state *dpu_crtc_duplicate_state(struct drm_crtc *crtc)return &cstate->base; } -/** -* dpu_crtc_reset - reset hook for CRTCs -* Resets the atomic state for @crtc by freeing the state pointer (which might -* be NULL, e.g. at driver load time) and allocating a new empty state object. -* @crtc: Pointer to drm crtc structure -*/ -static void dpu_crtc_reset (struct drm_crtc *crtc) -{ -struct dpu_crtc *dpu_crtc; -struct dpu_crtc_state *cstate; - -if (!crtc) { -DPU_ERROR ("invalid crtc\n" ); -return ; - } - -/* revert suspend actions, if necessary */ -if (dpu_kms_is_suspend_state (crtc->dev)) -_dpu_crtc_set_suspend (crtc, false); - -/* remove previous state, if present */ -if (crtc->state) { -dpu_crtc_destroy_state (crtc, crtc->state); - crtc->state =0 ; - } - - dpu_crtc =to_dpu_crtc (crtc); - cstate =kzalloc (sizeof (*cstate),GFP_KERNEL ); -if (!cstate) { -DPU_ERROR ("failed to allocate state\n" ); -return ; - } - - cstate->base.crtc = crtc; - crtc->state = &cstate->base; -} -static void dpu_crtc_handle_power_event (u32 event_type,void *arg) {struct drm_crtc *crtc = arg;@@ -1499,7 +1462,7 @@ static const struct drm_crtc_funcs dpu_crtc_funcs = { .set_config = drm_atomic_helper_set_config, .destroy = dpu_crtc_destroy, .page_flip = drm_atomic_helper_page_flip, - .reset = dpu_crtc_reset, + .reset = drm_atomic_helper_crtc_reset, .atomic_duplicate_state = dpu_crtc_duplicate_state, .atomic_destroy_state = dpu_crtc_destroy_state, .late_register = dpu_crtc_late_register,Signature · 1 line
2.19.0.605.g01d371f741-goog
Signature · 5 lines
Sean Paul, Software Engineer, Google / Chromium OS _______________________________________________ Freedreno mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/freedreno