drm/msm/mdp5: A couple of fixes
cover drm/msm/mdp5: A couple of fixes
The 4th CRTC could not be accessed because of a missing case entry.
Also, only flush registers when a CRTC is enabled (and thus a CTL is allocated). This shall fix the cursor move issue that Rob mentioned.
Stephane Viau (2):
drm/msm: update generated headers (add 6th lm.base entry) drm/msm/mdp5: Avoid flushing registers when CRTC is disabled
drivers/gpu/drm/msm/mdp/mdp5/mdp5.xml.h | 15 ++++----------- drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c | 26 +++++++++++++++++++------- 2 files changed, 23 insertions(+), 18 deletions(-)
Signature · 3 lines
Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH 1/2 drm/msm: update generated headers (add 6th lm.base entry)
Some target have up to 6 layer mixers (LM). Let the header file access the last LM's base address.
--- drivers/gpu/drm/msm/mdp/mdp5/mdp5.xml.h | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-)
drivers/gpu/drm/msm/mdp/mdp5/mdp5.xml.h +4 -11
@@ -8,17 +8,9 @@ http://github.com/freedreno/envytools/ git clone https://github.com/freedreno/envytools.git The rules-ng-ng source files this header was generated from are: -- /home/robclark/src/freedreno/envytools/rnndb/msm.xml ( 676 bytes, from 2014-12-05 15:34:49) -- /home/robclark/src/freedreno/envytools/rnndb/freedreno_copyright.xml ( 1453 bytes, from 2013-03-31 16:51:27) -- /home/robclark/src/freedreno/envytools/rnndb/mdp/mdp4.xml ( 20908 bytes, from 2014-12-08 16:13:00) -- /home/robclark/src/freedreno/envytools/rnndb/mdp/mdp_common.xml ( 2357 bytes, from 2014-12-08 16:13:00) -- /home/robclark/src/freedreno/envytools/rnndb/mdp/mdp5.xml ( 27208 bytes, from 2015-01-13 23:56:11) -- /home/robclark/src/freedreno/envytools/rnndb/dsi/dsi.xml ( 11712 bytes, from 2013-08-17 17:13:43) -- /home/robclark/src/freedreno/envytools/rnndb/dsi/sfpb.xml ( 344 bytes, from 2013-08-11 19:26:32) -- /home/robclark/src/freedreno/envytools/rnndb/dsi/mmss_cc.xml ( 1686 bytes, from 2014-10-31 16:48:57) -- /home/robclark/src/freedreno/envytools/rnndb/hdmi/qfprom.xml ( 600 bytes, from 2013-07-05 19:21:12) -- /home/robclark/src/freedreno/envytools/rnndb/hdmi/hdmi.xml ( 26848 bytes, from 2015-01-13 23:55:57) -- /home/robclark/src/freedreno/envytools/rnndb/edp/edp.xml ( 8253 bytes, from 2014-12-08 16:13:00) +- /local/mnt2/workspace2/sviau/envytools/rnndb/mdp/mdp5.xml ( 27229 bytes, from 2015-02-10 17:00:41) +- /local/mnt2/workspace2/sviau/envytools/rnndb/freedreno_copyright.xml ( 1453 bytes, from 2014-06-02 18:31:15) +- /local/mnt2/workspace2/sviau/envytools/rnndb/mdp/mdp_common.xml ( 2357 bytes, from 2015-01-23 16:20:19) Copyright (C) 2013-2015 by the following authors: - Rob Clark <[email protected]> (robclark)
@@ -910,6 +902,7 @@ static inline uint32_t __offset_LM(uint32_t idx)case 2 :return (mdp5_cfg->lm.base[2 ]);case 3 :return (mdp5_cfg->lm.base[3 ]);case 4 :return (mdp5_cfg->lm.base[4 ]); +case 5 :return (mdp5_cfg->lm.base[5 ]);default :return INVALID_IDX (idx); } }
Signature · 3 lines
Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH 1/1 rnndb: Add a 6th lm.base entry
Some target have up to 6 layer mixers (LM). Let the xml file access the last LM's base address.
--- rnndb/mdp/mdp5.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
rnndb/mdp/mdp5.xml +1 -1
@@ -380,7 +380,7 @@ xsi:schemaLocation="http://nouveau.freedesktop.org/ rules-ng.xsd"> <reg32 offset="0x224" name="SCALE_INIT_PHASE_Y"/> </array> - <array doffsets="mdp5_cfg->lm.base[0],mdp5_cfg->lm.base[1],mdp5_cfg->lm.base[2],mdp5_cfg->lm.base[3],mdp5_cfg->lm.base[4]" name="LM" length="5" stride="0x400"> + <array doffsets="mdp5_cfg->lm.base[0],mdp5_cfg->lm.base[1],mdp5_cfg->lm.base[2],mdp5_cfg->lm.base[3],mdp5_cfg->lm.base[4],mdp5_cfg->lm.base[5]" name="LM" length="6" stride="0x400"> <reg32 offset="0x000" name="BLEND_COLOR_OUT"> <bitfield name="STAGE0_FG_ALPHA" pos="1" type="boolean"/> <bitfield name="STAGE1_FG_ALPHA" pos="2" type="boolean"/>
Signature · 3 lines
Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH 2/2 drm/msm/mdp5: Avoid flushing registers when CRTC is disabled
In reply to Stephane ViauWhen a CRTC is disabled, no CTL is allocated to it (CRTC->ctl == NULL); in that case we should not try to FLUSH registers and do nothing instead.
This can happen when we try to move a cursor but the CRTC's CTL (CONTROL) has not been allocated yet (inactive CRTC). It can also happens when we .atomic_check()/.atomic_flush() on a disabled CRTC.
A CTL needs to be kept as long as the CRTC is alive. Releasing it after the last VBlank is safer than in .atomic_flush().
--- drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-)
drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c +19 -7
@@ -103,8 +103,8 @@ static void crtc_flush_all(struct drm_crtc *crtc)struct drm_plane *plane;uint32_t flush_mask =0 ; -/* we could have already released CTL in the disable path: */ -if (!mdp5_crtc->ctl) +/* this should not happen: */ +if (WARN_ON (!mdp5_crtc->ctl))return ;drm_atomic_crtc_for_each_plane (plane, crtc) {
@@ -143,6 +143,11 @@ static void complete_flip(struct drm_crtc *crtc, struct drm_file *file)drm_atomic_crtc_for_each_plane (plane, crtc) {mdp5_plane_complete_flip (plane); } + +if (mdp5_crtc->ctl && !crtc->state->enable) { +mdp5_ctl_release (mdp5_crtc->ctl); + mdp5_crtc->ctl =NULL ; + } }static void unref_cursor_worker (struct drm_flip_work *work,void *val)
@@ -386,14 +391,17 @@ static void mdp5_crtc_atomic_flush(struct drm_crtc *crtc) mdp5_crtc->event = crtc->state->event;spin_unlock_irqrestore (&dev->event_lock, flags); +/* +* If no CTL has been allocated in mdp5_crtc_atomic_check(), +* it means we are trying to flush a CRTC whose state is disabled: +* nothing else needs to be done. +*/ +if (unlikely (!mdp5_crtc->ctl)) +return ; +blend_setup (crtc);crtc_flush_all (crtc);request_pending (crtc,PENDING_FLIP ); - -if (mdp5_crtc->ctl && !crtc->state->enable) { -mdp5_ctl_release (mdp5_crtc->ctl); - mdp5_crtc->ctl =NULL ; - } } static int mdp5_crtc_set_property(struct drm_crtc *crtc,
@@ -495,6 +503,10 @@ static int mdp5_crtc_cursor_move(struct drm_crtc *crtc, int x, int y)uint32_t roi_h;unsigned long flags; +/* In case the CRTC is disabled, just drop the cursor update */ +if (unlikely (!crtc->state->enable)) +return 0 ; + x = (x >0 ) ? x :0 ; y = (y >0 ) ? y :0 ;
Signature · 8 lines
Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel