drm/msm: Enable clocks during enable/disable_vblank() callbacks
PATCH 1/1 drm/msm: Enable clocks during enable/disable_vblank() callbacks
AHB clock should be enabled before accessing registers during enable/disable_vblank(). Since these 2 callbacks are called in atomic context while clk_prepare may cause thread sleep, a work is scheduled to control vblanks.
Signed-off-by Hai Li <[email protected]>
--- drivers/gpu/drm/msm/mdp/mdp4/mdp4_irq.c | 9 ++++ drivers/gpu/drm/msm/mdp/mdp5/mdp5_irq.c | 9 ++++ drivers/gpu/drm/msm/msm_drv.c | 73 ++++++++++++++++++++++++++++++++- drivers/gpu/drm/msm/msm_drv.h | 8 ++++ 4 files changed, 97 insertions(+), 2 deletions(-)
drivers/gpu/drm/msm/mdp/mdp4/mdp4_irq.c +9 -0
@@ -86,13 +86,22 @@ irqreturn_t mdp4_irq(struct msm_kms *kms)int mdp4_enable_vblank (struct msm_kms *kms,struct drm_crtc *crtc) { +struct mdp4_kms *mdp4_kms =to_mdp4_kms (to_mdp_kms (kms)); + +mdp4_enable (mdp4_kms);mdp_update_vblank_mask (to_mdp_kms (kms),mdp4_crtc_vblank (crtc), true); +mdp4_disable (mdp4_kms); +return 0 ; }void mdp4_disable_vblank (struct msm_kms *kms,struct drm_crtc *crtc) { +struct mdp4_kms *mdp4_kms =to_mdp4_kms (to_mdp_kms (kms)); + +mdp4_enable (mdp4_kms);mdp_update_vblank_mask (to_mdp_kms (kms),mdp4_crtc_vblank (crtc), false); +mdp4_disable (mdp4_kms); }
drivers/gpu/drm/msm/mdp/mdp5/mdp5_irq.c +9 -0
@@ -112,15 +112,24 @@ irqreturn_t mdp5_irq(struct msm_kms *kms)int mdp5_enable_vblank (struct msm_kms *kms,struct drm_crtc *crtc) { +struct mdp5_kms *mdp5_kms =to_mdp5_kms (to_mdp_kms (kms)); + +mdp5_enable (mdp5_kms);mdp_update_vblank_mask (to_mdp_kms (kms),mdp5_crtc_vblank (crtc), true); +mdp5_disable (mdp5_kms); +return 0 ; }void mdp5_disable_vblank (struct msm_kms *kms,struct drm_crtc *crtc) { +struct mdp5_kms *mdp5_kms =to_mdp5_kms (to_mdp_kms (kms)); + +mdp5_enable (mdp5_kms);mdp_update_vblank_mask (to_mdp_kms (kms),mdp5_crtc_vblank (crtc), false); +mdp5_disable (mdp5_kms); }/*
drivers/gpu/drm/msm/msm_drv.c +71 -2
103 lines not on this page · raw message
drivers/gpu/drm/msm/msm_drv.h +8 -0
@@ -64,6 +64,12 @@ struct msm_file_private {int dummy; }; +struct msm_vblank_ctrl { +struct work_struct work; +struct list_head event_list; +spinlock_t lock; +}; +struct msm_drm_private {struct msm_kms *kms;
@@ -137,6 +143,8 @@ struct msm_drm_private {*/ struct drm_mm mm; } vram; + +struct msm_vblank_ctrl vblank_ctrl; };struct msm_format {
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
PATCH v2 1/1 drm/msm: Enable clocks during enable/disable_vblank() callbacks
AHB clock should be enabled before accessing registers during enable/disable_vblank(). Since these 2 callbacks are called in atomic context while clk_prepare may cause thread sleep, a work is scheduled to control vblanks.
v2: fixup spinlock initialization
Signed-off-by Hai Li <[email protected]>
--- drivers/gpu/drm/msm/mdp/mdp4/mdp4_irq.c | 9 ++++ drivers/gpu/drm/msm/mdp/mdp5/mdp5_irq.c | 9 ++++ drivers/gpu/drm/msm/msm_drv.c | 74 ++++++++++++++++++++++++++++++++- drivers/gpu/drm/msm/msm_drv.h | 8 ++++ 4 files changed, 98 insertions(+), 2 deletions(-)
drivers/gpu/drm/msm/mdp/mdp4/mdp4_irq.c +9 -0
@@ -86,13 +86,22 @@ irqreturn_t mdp4_irq(struct msm_kms *kms)int mdp4_enable_vblank (struct msm_kms *kms,struct drm_crtc *crtc) { +struct mdp4_kms *mdp4_kms =to_mdp4_kms (to_mdp_kms (kms)); + +mdp4_enable (mdp4_kms);mdp_update_vblank_mask (to_mdp_kms (kms),mdp4_crtc_vblank (crtc), true); +mdp4_disable (mdp4_kms); +return 0 ; }void mdp4_disable_vblank (struct msm_kms *kms,struct drm_crtc *crtc) { +struct mdp4_kms *mdp4_kms =to_mdp4_kms (to_mdp_kms (kms)); + +mdp4_enable (mdp4_kms);mdp_update_vblank_mask (to_mdp_kms (kms),mdp4_crtc_vblank (crtc), false); +mdp4_disable (mdp4_kms); }
drivers/gpu/drm/msm/mdp/mdp5/mdp5_irq.c +9 -0
@@ -112,15 +112,24 @@ irqreturn_t mdp5_irq(struct msm_kms *kms)int mdp5_enable_vblank (struct msm_kms *kms,struct drm_crtc *crtc) { +struct mdp5_kms *mdp5_kms =to_mdp5_kms (to_mdp_kms (kms)); + +mdp5_enable (mdp5_kms);mdp_update_vblank_mask (to_mdp_kms (kms),mdp5_crtc_vblank (crtc), true); +mdp5_disable (mdp5_kms); +return 0 ; }void mdp5_disable_vblank (struct msm_kms *kms,struct drm_crtc *crtc) { +struct mdp5_kms *mdp5_kms =to_mdp5_kms (to_mdp_kms (kms)); + +mdp5_enable (mdp5_kms);mdp_update_vblank_mask (to_mdp_kms (kms),mdp5_crtc_vblank (crtc), false); +mdp5_disable (mdp5_kms); }/*
drivers/gpu/drm/msm/msm_drv.c +72 -2
104 lines not on this page · raw message
drivers/gpu/drm/msm/msm_drv.h +8 -0
@@ -64,6 +64,12 @@ struct msm_file_private {int dummy; }; +struct msm_vblank_ctrl { +struct work_struct work; +struct list_head event_list; +spinlock_t lock; +}; +struct msm_drm_private {struct msm_kms *kms;
@@ -137,6 +143,8 @@ struct msm_drm_private {*/ struct drm_mm mm; } vram; + +struct msm_vblank_ctrl vblank_ctrl; };struct msm_format {
Signature · 7 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel