Skip to contentSkip to conversation

drm/msm/dpu: move vblank events to complete_commit()

PATCH In review Rob Clark 3 participants 10 messages Sep 7, 2020 – Sep 8, 2020 1 message not in the archive

Subsystems (3)
lore
Share & tools
lore

Rob Clark

author
#0 lore raw

PATCH 1/2 drm/msm/dpu: move vblank events to complete_commit()

From: Rob Clark <[email protected]>

We could get a vblank event racing with the current atomic commit, resulting in sending the pageflip event to userspace early, causing tearing. On the other hand, complete_commit() ensures that the pending flush is complete.

---
 drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +1 -1
index c2729f71e2fa..89c0245b5de5 100644
@@ -297,7 +297,6 @@ void dpu_crtc_vblank_callback(struct drm_crtc *crtc)
 		dpu_crtc->vblank_cb_time = ktime_get();
 	else
 		dpu_crtc->vblank_cb_count++;
-	_dpu_crtc_complete_flip(crtc);
 	drm_crtc_handle_vblank(crtc);
 	trace_dpu_crtc_vblank_cb(DRMID(crtc));
 }
@@ -402,6 +401,7 @@ static void dpu_crtc_frame_event_cb(void *data, u32 event)
 void dpu_crtc_complete_commit(struct drm_crtc *crtc)
 {
 	trace_dpu_crtc_complete_commit(DRMID(crtc));
+	_dpu_crtc_complete_flip(crtc);
 }
 
 static void _dpu_crtc_setup_lm_bounds(struct drm_crtc *crtc,
Signature · 1 line
2.26.2
author
#1 lore raw

PATCH 2/2 drm/msm/dpu: clean up some impossibilities

From: Rob Clark <[email protected]>

---
 drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 81 ++++--------------------
 1 file changed, 12 insertions(+), 69 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +12 -69
index 89c0245b5de5..ad49b0e17fcb 100644
@@ -265,11 +265,6 @@ enum dpu_intf_mode dpu_crtc_get_intf_mode(struct drm_crtc *crtc)
 {
 	struct drm_encoder *encoder;
 
-	if (!crtc) {
-		DPU_ERROR("invalid crtc\n");
-		return INTF_MODE_NONE;
-	}
-
 	/*
 	 * TODO: This function is called from dpu debugfs and as part of atomic
 	 * check. When called from debugfs, the crtc->mutex must be held to
@@ -500,12 +495,6 @@ static void dpu_crtc_atomic_begin(struct drm_crtc *crtc,
 	struct dpu_crtc_state *cstate;
 	struct drm_encoder *encoder;
 	struct drm_device *dev;
-	unsigned long flags;
-
-	if (!crtc) {
-		DPU_ERROR("invalid crtc\n");
-		return;
-	}
 
 	if (!crtc->state->enable) {
 		DPU_DEBUG("crtc%d -> enable %d, skip atomic_begin\n",
@@ -521,15 +510,6 @@ static void dpu_crtc_atomic_begin(struct drm_crtc *crtc,
 
 	_dpu_crtc_setup_lm_bounds(crtc, crtc->state);
 
-	if (dpu_crtc->event) {
-		WARN_ON(dpu_crtc->event);
-	} else {
-		spin_lock_irqsave(&dev->event_lock, flags);
-		dpu_crtc->event = crtc->state->event;
-		crtc->state->event = NULL;
-		spin_unlock_irqrestore(&dev->event_lock, flags);
-	}
-
 	/* encoder will trigger pending mask now */
 	drm_for_each_encoder_mask(encoder, crtc->dev, crtc->state->encoder_mask)
 		dpu_encoder_trigger_kickoff_pending(encoder);
@@ -583,14 +563,11 @@ static void dpu_crtc_atomic_flush(struct drm_crtc *crtc,
 		return;
 	}
 
-	if (dpu_crtc->event) {
-		DPU_DEBUG("already received dpu_crtc->event\n");
-	} else {
-		spin_lock_irqsave(&dev->event_lock, flags);
-		dpu_crtc->event = crtc->state->event;
-		crtc->state->event = NULL;
-		spin_unlock_irqrestore(&dev->event_lock, flags);
-	}
+	WARN_ON(dpu_crtc->event);
+	spin_lock_irqsave(&dev->event_lock, flags);
+	dpu_crtc->event = crtc->state->event;
+	crtc->state->event = NULL;
+	spin_unlock_irqrestore(&dev->event_lock, flags);
 
 	/*
 	 * If no mixers has been allocated in dpu_crtc_atomic_check(),
@@ -635,14 +612,7 @@ static void dpu_crtc_atomic_flush(struct drm_crtc *crtc,
 static void dpu_crtc_destroy_state(struct drm_crtc *crtc,
 		struct drm_crtc_state *state)
 {
-	struct dpu_crtc_state *cstate;
-
-	if (!crtc || !state) {
-		DPU_ERROR("invalid argument(s)\n");
-		return;
-	}
-
-	cstate = to_dpu_crtc_state(state);
+	struct dpu_crtc_state *cstate = to_dpu_crtc_state(state);
 
 	DPU_DEBUG("crtc%d\n", crtc->base.id);
 
@@ -731,14 +701,8 @@ static void dpu_crtc_reset(struct drm_crtc *crtc)
  */
 static struct drm_crtc_state *dpu_crtc_duplicate_state(struct drm_crtc *crtc)
 {
-	struct dpu_crtc_state *cstate, *old_cstate;
-
-	if (!crtc || !crtc->state) {
-		DPU_ERROR("invalid argument(s)\n");
-		return NULL;
-	}
+	struct dpu_crtc_state *cstate, *old_cstate = to_dpu_crtc_state(crtc->state);
 
-	old_cstate = to_dpu_crtc_state(crtc->state);
 	cstate = kmemdup(old_cstate, sizeof(*old_cstate), GFP_KERNEL);
 	if (!cstate) {
 		DPU_ERROR("failed to allocate state\n");
@@ -754,19 +718,12 @@ static struct drm_crtc_state *dpu_crtc_duplicate_state(struct drm_crtc *crtc)
 static void dpu_crtc_disable(struct drm_crtc *crtc,
 			     struct drm_crtc_state *old_crtc_state)
 {
-	struct dpu_crtc *dpu_crtc;
-	struct dpu_crtc_state *cstate;
+	struct dpu_crtc *dpu_crtc = to_dpu_crtc(crtc);
+	struct dpu_crtc_state *cstate = to_dpu_crtc_state(crtc->state);
 	struct drm_encoder *encoder;
 	unsigned long flags;
 	bool release_bandwidth = false;
 
-	if (!crtc || !crtc->state) {
-		DPU_ERROR("invalid crtc\n");
-		return;
-	}
-	dpu_crtc = to_dpu_crtc(crtc);
-	cstate = to_dpu_crtc_state(crtc->state);
-
 	DRM_DEBUG_KMS("crtc%d\n", crtc->base.id);
 
 	/* Disable/save vblank irq handling */
@@ -825,19 +782,13 @@ static void dpu_crtc_disable(struct drm_crtc *crtc,
 static void dpu_crtc_enable(struct drm_crtc *crtc,
 		struct drm_crtc_state *old_crtc_state)
 {
-	struct dpu_crtc *dpu_crtc;
+	struct dpu_crtc *dpu_crtc = to_dpu_crtc(crtc);
 	struct drm_encoder *encoder;
 	bool request_bandwidth = false;
 
-	if (!crtc) {
-		DPU_ERROR("invalid crtc\n");
-		return;
-	}
-
 	pm_runtime_get_sync(crtc->dev->dev);
 
 	DRM_DEBUG_KMS("crtc%d\n", crtc->base.id);
-	dpu_crtc = to_dpu_crtc(crtc);
 
 	drm_for_each_encoder_mask(encoder, crtc->dev, crtc->state->encoder_mask) {
 		/* in video mode, we hold an extra bandwidth reference
@@ -873,9 +824,9 @@ struct plane_state {
 static int dpu_crtc_atomic_check(struct drm_crtc *crtc,
 		struct drm_crtc_state *state)
 {
-	struct dpu_crtc *dpu_crtc;
+	struct dpu_crtc *dpu_crtc = to_dpu_crtc(crtc);
+	struct dpu_crtc_state *cstate = to_dpu_crtc_state(state);
 	struct plane_state *pstates;
-	struct dpu_crtc_state *cstate;
 
 	const struct drm_plane_state *pstate;
 	struct drm_plane *plane;
@@ -889,16 +840,8 @@ static int dpu_crtc_atomic_check(struct drm_crtc *crtc,
 	int left_zpos_cnt = 0, right_zpos_cnt = 0;
 	struct drm_rect crtc_rect = { 0 };
 
-	if (!crtc) {
-		DPU_ERROR("invalid crtc\n");
-		return -EINVAL;
-	}
-
 	pstates = kzalloc(sizeof(*pstates) * DPU_STAGE_MAX * 4, GFP_KERNEL);
 
-	dpu_crtc = to_dpu_crtc(crtc);
-	cstate = to_dpu_crtc_state(state);
-
 	if (!state->enable || !state->active) {
 		DPU_DEBUG("crtc%d -> enable %d, active %d, skip atomic_check\n",
 				crtc->base.id, state->enable, state->active);
Signature · 6 lines
2.26.2

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#2 lore raw

Re: [PATCH 2/2] drm/msm/dpu: clean up some impossibilities

I love your patch! Perhaps something to improve:

Hi Rob,

I love your patch! Perhaps something to improve:

[auto build test WARNING on drm-tip/drm-tip]
[also build test WARNING on linus/master v5.9-rc4 next-20200903]
[cannot apply to drm-intel/for-linux-next tegra-drm/drm/tegra/for-next drm/drm-next drm-exynos/exynos-drm-next] [If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]

url:    https://github.com/0day-ci/linux/commits/Rob-Clark/drm-msm-dpu-move-vblank-events-to-complete_commit/20200908-020331
base:   git://anongit.freedesktop.org/drm/drm-tip drm-tip
config: arm-defconfig (attached as .config)
compiler: arm-linux-gnueabi-gcc (GCC) 9.3.0

reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross ARCH=arm

If you fix the issue, kindly add following tag as appropriate

All warnings (new ones prefixed by >>):

drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c: In function '_dpu_crtc_setup_cp_blocks':
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c:455:23: warning: variable 'lm' set but not used [-Wunused-but-set-variable]

     455 |  struct dpu_hw_mixer *lm;
         |                       ^~
   drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c: In function 'dpu_crtc_atomic_begin':
>> drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c:497:21: warning: variable 'dev' set but not used [-Wunused-but-set-variable]
     497 |  struct drm_device *dev;
         |                     ^~~
   drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c:494:19: warning: variable 'dpu_crtc' set but not used [-Wunused-but-set-variable]
     494 |  struct dpu_crtc *dpu_crtc;
         |                   ^~~~~~~~

# https://github.com/0day-ci/linux/commit/b151bdc57ce4c96820a99dd0c5cec106f227444c
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Rob-Clark/drm-msm-dpu-move-vblank-events-to-complete_commit/20200908-020331 git checkout b151bdc57ce4c96820a99dd0c5cec106f227444c
vim +/dev +497 drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c

4259ff7ae509ed Kalyan Thota      2020-03-24  490  
25fdd5933e4c0f Jeykumar Sankaran 2018-06-27  491  static void dpu_crtc_atomic_begin(struct drm_crtc *crtc,
25fdd5933e4c0f Jeykumar Sankaran 2018-06-27  492  		struct drm_crtc_state *old_state)
25fdd5933e4c0f Jeykumar Sankaran 2018-06-27  493  {
25fdd5933e4c0f Jeykumar Sankaran 2018-06-27  494  	struct dpu_crtc *dpu_crtc;
9222cdd27e823c Jeykumar Sankaran 2018-09-05  495  	struct dpu_crtc_state *cstate;
25fdd5933e4c0f Jeykumar Sankaran 2018-06-27  496  	struct drm_encoder *encoder;
25fdd5933e4c0f Jeykumar Sankaran 2018-06-27 @497  	struct drm_device *dev;
25fdd5933e4c0f Jeykumar Sankaran 2018-06-27  498  
25fdd5933e4c0f Jeykumar Sankaran 2018-06-27  499  	if (!crtc->state->enable) {
25fdd5933e4c0f Jeykumar Sankaran 2018-06-27  500  		DPU_DEBUG("crtc%d -> enable %d, skip atomic_begin\n",
25fdd5933e4c0f Jeykumar Sankaran 2018-06-27  501  				crtc->base.id, crtc->state->enable);
25fdd5933e4c0f Jeykumar Sankaran 2018-06-27  502  		return;
25fdd5933e4c0f Jeykumar Sankaran 2018-06-27  503  	}
25fdd5933e4c0f Jeykumar Sankaran 2018-06-27  504  
25fdd5933e4c0f Jeykumar Sankaran 2018-06-27  505  	DPU_DEBUG("crtc%d\n", crtc->base.id);
25fdd5933e4c0f Jeykumar Sankaran 2018-06-27  506  
25fdd5933e4c0f Jeykumar Sankaran 2018-06-27  507  	dpu_crtc = to_dpu_crtc(crtc);
9222cdd27e823c Jeykumar Sankaran 2018-09-05  508  	cstate = to_dpu_crtc_state(crtc->state);
25fdd5933e4c0f Jeykumar Sankaran 2018-06-27  509  	dev = crtc->dev;
25fdd5933e4c0f Jeykumar Sankaran 2018-06-27  510  
25fdd5933e4c0f Jeykumar Sankaran 2018-06-27  511  	_dpu_crtc_setup_lm_bounds(crtc, crtc->state);
25fdd5933e4c0f Jeykumar Sankaran 2018-06-27  512  
25fdd5933e4c0f Jeykumar Sankaran 2018-06-27  513  	/* encoder will trigger pending mask now */
4b8c6279593aa6 Sean Paul         2018-11-16  514  	drm_for_each_encoder_mask(encoder, crtc->dev, crtc->state->encoder_mask)
25fdd5933e4c0f Jeykumar Sankaran 2018-06-27  515  		dpu_encoder_trigger_kickoff_pending(encoder);
25fdd5933e4c0f Jeykumar Sankaran 2018-06-27  516  
25fdd5933e4c0f Jeykumar Sankaran 2018-06-27  517  	/*
25fdd5933e4c0f Jeykumar Sankaran 2018-06-27  518  	 * If no mixers have been allocated in dpu_crtc_atomic_check(),
25fdd5933e4c0f Jeykumar Sankaran 2018-06-27  519  	 * it means we are trying to flush a CRTC whose state is disabled:
25fdd5933e4c0f Jeykumar Sankaran 2018-06-27  520  	 * nothing else needs to be done.
25fdd5933e4c0f Jeykumar Sankaran 2018-06-27  521  	 */
9222cdd27e823c Jeykumar Sankaran 2018-09-05  522  	if (unlikely(!cstate->num_mixers))
25fdd5933e4c0f Jeykumar Sankaran 2018-06-27  523  		return;
25fdd5933e4c0f Jeykumar Sankaran 2018-06-27  524  
25fdd5933e4c0f Jeykumar Sankaran 2018-06-27  525  	_dpu_crtc_blend_setup(crtc);
25fdd5933e4c0f Jeykumar Sankaran 2018-06-27  526  
4259ff7ae509ed Kalyan Thota      2020-03-24  527  	_dpu_crtc_setup_cp_blocks(crtc);
4259ff7ae509ed Kalyan Thota      2020-03-24  528  
25fdd5933e4c0f Jeykumar Sankaran 2018-06-27  529  	/*
25fdd5933e4c0f Jeykumar Sankaran 2018-06-27  530  	 * PP_DONE irq is only used by command mode for now.
25fdd5933e4c0f Jeykumar Sankaran 2018-06-27  531  	 * It is better to request pending before FLUSH and START trigger
25fdd5933e4c0f Jeykumar Sankaran 2018-06-27  532  	 * to make sure no pp_done irq missed.
25fdd5933e4c0f Jeykumar Sankaran 2018-06-27  533  	 * This is safe because no pp_done will happen before SW trigger
25fdd5933e4c0f Jeykumar Sankaran 2018-06-27  534  	 * in command mode.
25fdd5933e4c0f Jeykumar Sankaran 2018-06-27  535  	 */
25fdd5933e4c0f Jeykumar Sankaran 2018-06-27  536  }
25fdd5933e4c0f Jeykumar Sankaran 2018-06-27  537  

---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org

Reviewed-by on v1 1/2
#9 lore raw
In reply to Rob Clark
Quoted 8 lines · Rob Clark

From: Rob Clark <[email protected]>

We could get a vblank event racing with the current atomic commit, resulting in sending the pageflip event to userspace early, causing tearing. On the other hand, complete_commit() ensures that the pending flush is complete.

I checked our downstream code as well and yes we are not signaling page flips inside the vblank_cb and are doing it after wait_for_commit_done This aligns with that.
Hence,

Quoted 27 lines
---
 drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +0 -1
index c2729f71e2fa..89c0245b5de5 100644
@@ -297,7 +297,6 @@ void dpu_crtc_vblank_callback(struct drm_crtc 
 *crtc)
 		dpu_crtc->vblank_cb_time = ktime_get();
 	else
 		dpu_crtc->vblank_cb_count++;
-	_dpu_crtc_complete_flip(crtc);
 	drm_crtc_handle_vblank(crtc);
 	trace_dpu_crtc_vblank_cb(DRMID(crtc));

}

drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +1 -0
@@ -402,6 +401,7 @@ static void dpu_crtc_frame_event_cb(void *data, u32 
 event)
 void dpu_crtc_complete_commit(struct drm_crtc *crtc)
 {
 	trace_dpu_crtc_complete_commit(DRMID(crtc));
+	_dpu_crtc_complete_flip(crtc);
 }
 

static void _dpu_crtc_setup_lm_bounds(struct drm_crtc *crtc,

Reviewed-by on v1 1/2
#10 lore raw
In reply to Rob Clark
Quoted 8 lines · Rob Clark

From: Rob Clark <[email protected]>

We could get a vblank event racing with the current atomic commit, resulting in sending the pageflip event to userspace early, causing tearing. On the other hand, complete_commit() ensures that the pending flush is complete.

I checked our downstream code as well and yes we are not signaling page flips inside the vblank_cb and are doing it after wait_for_commit_done This aligns with that.
Hence,

Quoted 26 lines
---
 drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +0 -1
index c2729f71e2fa..89c0245b5de5 100644
@@ -297,7 +297,6 @@ void dpu_crtc_vblank_callback(struct drm_crtc 
 *crtc)
 		dpu_crtc->vblank_cb_time = ktime_get();
 	else
 		dpu_crtc->vblank_cb_count++;
-	_dpu_crtc_complete_flip(crtc);
 	drm_crtc_handle_vblank(crtc);
 	trace_dpu_crtc_vblank_cb(DRMID(crtc));

}

drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +1 -0
@@ -402,6 +401,7 @@ static void dpu_crtc_frame_event_cb(void *data, u32 
 event)
 void dpu_crtc_complete_commit(struct drm_crtc *crtc)
 {
 	trace_dpu_crtc_complete_commit(DRMID(crtc));
+	_dpu_crtc_complete_flip(crtc);
 }
 
Quoted 1 line

static void _dpu_crtc_setup_lm_bounds(struct drm_crtc *crtc,

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

#3 lore raw

Re: [PATCH 2/2] drm/msm/dpu: clean up some impossibilities

In reply to Rob Clark
Quoted 62 lines · Rob Clark

From: Rob Clark <[email protected]>

---
 drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 81 ++++--------------------
 1 file changed, 12 insertions(+), 69 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +0 -5
index 89c0245b5de5..ad49b0e17fcb 100644
@@ -265,11 +265,6 @@ enum dpu_intf_mode dpu_crtc_get_intf_mode(struct
 drm_crtc *crtc)
 {
 	struct drm_encoder *encoder;
 
-	if (!crtc) {
-		DPU_ERROR("invalid crtc\n");
-		return INTF_MODE_NONE;
-	}
-
 	/*
 	 * TODO: This function is called from dpu debugfs and as part of 

atomic

drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +0 -6
 	 * check. When called from debugfs, the crtc->mutex must be held to
@@ -500,12 +495,6 @@ static void dpu_crtc_atomic_begin(struct drm_crtc 
 *crtc,
 	struct dpu_crtc_state *cstate;
 	struct drm_encoder *encoder;
 	struct drm_device *dev;
-	unsigned long flags;
-
-	if (!crtc) {
-		DPU_ERROR("invalid crtc\n");
-		return;
-	}
 
 	if (!crtc->state->enable) {
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +0 -9
 		DPU_DEBUG("crtc%d -> enable %d, skip atomic_begin\n",
@@ -521,15 +510,6 @@ static void dpu_crtc_atomic_begin(struct drm_crtc 
 *crtc,
 
 	_dpu_crtc_setup_lm_bounds(crtc, crtc->state);
 
-	if (dpu_crtc->event) {
-		WARN_ON(dpu_crtc->event);
-	} else {
-		spin_lock_irqsave(&dev->event_lock, flags);
-		dpu_crtc->event = crtc->state->event;
-		crtc->state->event = NULL;
-		spin_unlock_irqrestore(&dev->event_lock, flags);
-	}
-
 	/* encoder will trigger pending mask now */
 	drm_for_each_encoder_mask(encoder, crtc->dev, 

crtc->state->encoder_mask)

drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +0 -0
 		dpu_encoder_trigger_kickoff_pending(encoder);
@@ -583,14 +563,11 @@ static void dpu_crtc_atomic_flush(struct drm_crtc 
 *crtc,
 		return;
 	}

drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c static void dpu_crtc_atomic_flush(struct drm_crtc · line 567

Quoted 10 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +1 -8
 
-	if (dpu_crtc->event) {
-		DPU_DEBUG("already received dpu_crtc->event\n");
-	} else {
-		spin_lock_irqsave(&dev->event_lock, flags);
-		dpu_crtc->event = crtc->state->event;
-		crtc->state->event = NULL;
-		spin_unlock_irqrestore(&dev->event_lock, flags);
-	}
+	WARN_ON(dpu_crtc->event);

before the patch "move vblank events to complete_commit()", the dpu_crtc events were consumed in the _dpu_crtc_complete_flip(). So there was a chance that if the vblank event did not come in time before the next commit, dpu_crtc->event will not be consumed.

But after the patch, _dpu_crtc_complete_flip() is being signaled in dpu_crtc_complete_commit() which will always happen, so is there any case where we will hit this warning at all or will this catch some other condition?

Quoted 118 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +4 -0
+	spin_lock_irqsave(&dev->event_lock, flags);
+	dpu_crtc->event = crtc->state->event;
+	crtc->state->event = NULL;
+	spin_unlock_irqrestore(&dev->event_lock, flags);
 
 	/*
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +2 -15
 	 * If no mixers has been allocated in dpu_crtc_atomic_check(),
@@ -635,14 +612,7 @@ static void dpu_crtc_atomic_flush(struct drm_crtc 
 *crtc,
 static void dpu_crtc_destroy_state(struct drm_crtc *crtc,
 		struct drm_crtc_state *state)
 {
-	struct dpu_crtc_state *cstate;
-
-	if (!crtc || !state) {
-		DPU_ERROR("invalid argument(s)\n");
-		return;
-	}
-
-	cstate = to_dpu_crtc_state(state);
+	struct dpu_crtc_state *cstate = to_dpu_crtc_state(state);
 
 	DPU_DEBUG("crtc%d\n", crtc->base.id);
@@ -731,14 +701,8 @@ static void dpu_crtc_reset(struct drm_crtc *crtc)
  */
 static struct drm_crtc_state *dpu_crtc_duplicate_state(struct drm_crtc 
 *crtc)
 {
-	struct dpu_crtc_state *cstate, *old_cstate;
-
-	if (!crtc || !crtc->state) {
-		DPU_ERROR("invalid argument(s)\n");
-		return NULL;
-	}
+	struct dpu_crtc_state *cstate, *old_cstate = 
 to_dpu_crtc_state(crtc->state);
 
-	old_cstate = to_dpu_crtc_state(crtc->state);
 	cstate = kmemdup(old_cstate, sizeof(*old_cstate), GFP_KERNEL);
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +2 -9
 	if (!cstate) {
 		DPU_ERROR("failed to allocate state\n");
@@ -754,19 +718,12 @@ static struct drm_crtc_state
 *dpu_crtc_duplicate_state(struct drm_crtc *crtc)
 static void dpu_crtc_disable(struct drm_crtc *crtc,
 			     struct drm_crtc_state *old_crtc_state)
 {
-	struct dpu_crtc *dpu_crtc;
-	struct dpu_crtc_state *cstate;
+	struct dpu_crtc *dpu_crtc = to_dpu_crtc(crtc);
+	struct dpu_crtc_state *cstate = to_dpu_crtc_state(crtc->state);
 	struct drm_encoder *encoder;
 	unsigned long flags;
 	bool release_bandwidth = false;
 
-	if (!crtc || !crtc->state) {
-		DPU_ERROR("invalid crtc\n");
-		return;
-	}
-	dpu_crtc = to_dpu_crtc(crtc);
-	cstate = to_dpu_crtc_state(crtc->state);
-
 	DRM_DEBUG_KMS("crtc%d\n", crtc->base.id);
 
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +1 -7
 	/* Disable/save vblank irq handling */
@@ -825,19 +782,13 @@ static void dpu_crtc_disable(struct drm_crtc 
 *crtc,
 static void dpu_crtc_enable(struct drm_crtc *crtc,
 		struct drm_crtc_state *old_crtc_state)
 {
-	struct dpu_crtc *dpu_crtc;
+	struct dpu_crtc *dpu_crtc = to_dpu_crtc(crtc);
 	struct drm_encoder *encoder;
 	bool request_bandwidth = false;
 
-	if (!crtc) {
-		DPU_ERROR("invalid crtc\n");
-		return;
-	}
-
 	pm_runtime_get_sync(crtc->dev->dev);
 
 	DRM_DEBUG_KMS("crtc%d\n", crtc->base.id);
-	dpu_crtc = to_dpu_crtc(crtc);
 
 	drm_for_each_encoder_mask(encoder, crtc->dev, 

crtc->state->encoder_mask) {

drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +2 -10
 		/* in video mode, we hold an extra bandwidth reference
@@ -873,9 +824,9 @@ struct plane_state {
 static int dpu_crtc_atomic_check(struct drm_crtc *crtc,
 		struct drm_crtc_state *state)
 {
-	struct dpu_crtc *dpu_crtc;
+	struct dpu_crtc *dpu_crtc = to_dpu_crtc(crtc);
+	struct dpu_crtc_state *cstate = to_dpu_crtc_state(state);
 	struct plane_state *pstates;
-	struct dpu_crtc_state *cstate;
 
 	const struct drm_plane_state *pstate;
 	struct drm_plane *plane;
@@ -889,16 +840,8 @@ static int dpu_crtc_atomic_check(struct drm_crtc 
 *crtc,
 	int left_zpos_cnt = 0, right_zpos_cnt = 0;
 	struct drm_rect crtc_rect = { 0 };
 
-	if (!crtc) {
-		DPU_ERROR("invalid crtc\n");
-		return -EINVAL;
-	}
-
 	pstates = kzalloc(sizeof(*pstates) * DPU_STAGE_MAX * 4, GFP_KERNEL);
 
-	dpu_crtc = to_dpu_crtc(crtc);
-	cstate = to_dpu_crtc_state(state);
-
 	if (!state->enable || !state->active) {
 		DPU_DEBUG("crtc%d -> enable %d, active %d, skip atomic_check\n",

crtc->base.id, state->enable, state->active);

#4 lore raw

Re: [PATCH 2/2] drm/msm/dpu: clean up some impossibilities

In reply to Rob Clark
Quoted 62 lines · Rob Clark

From: Rob Clark <[email protected]>

---
 drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 81 ++++--------------------
 1 file changed, 12 insertions(+), 69 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +0 -5
index 89c0245b5de5..ad49b0e17fcb 100644
@@ -265,11 +265,6 @@ enum dpu_intf_mode dpu_crtc_get_intf_mode(struct
 drm_crtc *crtc)
 {
 	struct drm_encoder *encoder;
 
-	if (!crtc) {
-		DPU_ERROR("invalid crtc\n");
-		return INTF_MODE_NONE;
-	}
-
 	/*
 	 * TODO: This function is called from dpu debugfs and as part of 

atomic

drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +0 -6
 	 * check. When called from debugfs, the crtc->mutex must be held to
@@ -500,12 +495,6 @@ static void dpu_crtc_atomic_begin(struct drm_crtc 
 *crtc,
 	struct dpu_crtc_state *cstate;
 	struct drm_encoder *encoder;
 	struct drm_device *dev;
-	unsigned long flags;
-
-	if (!crtc) {
-		DPU_ERROR("invalid crtc\n");
-		return;
-	}
 
 	if (!crtc->state->enable) {
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +0 -9
 		DPU_DEBUG("crtc%d -> enable %d, skip atomic_begin\n",
@@ -521,15 +510,6 @@ static void dpu_crtc_atomic_begin(struct drm_crtc 
 *crtc,
 
 	_dpu_crtc_setup_lm_bounds(crtc, crtc->state);
 
-	if (dpu_crtc->event) {
-		WARN_ON(dpu_crtc->event);
-	} else {
-		spin_lock_irqsave(&dev->event_lock, flags);
-		dpu_crtc->event = crtc->state->event;
-		crtc->state->event = NULL;
-		spin_unlock_irqrestore(&dev->event_lock, flags);
-	}
-
 	/* encoder will trigger pending mask now */
 	drm_for_each_encoder_mask(encoder, crtc->dev, 

crtc->state->encoder_mask)

drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +0 -0
 		dpu_encoder_trigger_kickoff_pending(encoder);
@@ -583,14 +563,11 @@ static void dpu_crtc_atomic_flush(struct drm_crtc 
 *crtc,
 		return;
 	}

drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c static void dpu_crtc_atomic_flush(struct drm_crtc · line 567

Quoted 10 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +1 -8
 
-	if (dpu_crtc->event) {
-		DPU_DEBUG("already received dpu_crtc->event\n");
-	} else {
-		spin_lock_irqsave(&dev->event_lock, flags);
-		dpu_crtc->event = crtc->state->event;
-		crtc->state->event = NULL;
-		spin_unlock_irqrestore(&dev->event_lock, flags);
-	}
+	WARN_ON(dpu_crtc->event);

before the patch "move vblank events to complete_commit()", the dpu_crtc events were consumed in the _dpu_crtc_complete_flip(). So there was a chance that if the vblank event did not come in time before the next commit, dpu_crtc->event will not be consumed.

But after the patch, _dpu_crtc_complete_flip() is being signaled in dpu_crtc_complete_commit() which will always happen, so is there any case where we will hit this warning at all or will this catch some other condition?

Quoted 117 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +4 -0
+	spin_lock_irqsave(&dev->event_lock, flags);
+	dpu_crtc->event = crtc->state->event;
+	crtc->state->event = NULL;
+	spin_unlock_irqrestore(&dev->event_lock, flags);
 
 	/*
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +2 -15
 	 * If no mixers has been allocated in dpu_crtc_atomic_check(),
@@ -635,14 +612,7 @@ static void dpu_crtc_atomic_flush(struct drm_crtc 
 *crtc,
 static void dpu_crtc_destroy_state(struct drm_crtc *crtc,
 		struct drm_crtc_state *state)
 {
-	struct dpu_crtc_state *cstate;
-
-	if (!crtc || !state) {
-		DPU_ERROR("invalid argument(s)\n");
-		return;
-	}
-
-	cstate = to_dpu_crtc_state(state);
+	struct dpu_crtc_state *cstate = to_dpu_crtc_state(state);
 
 	DPU_DEBUG("crtc%d\n", crtc->base.id);
@@ -731,14 +701,8 @@ static void dpu_crtc_reset(struct drm_crtc *crtc)
  */
 static struct drm_crtc_state *dpu_crtc_duplicate_state(struct drm_crtc 
 *crtc)
 {
-	struct dpu_crtc_state *cstate, *old_cstate;
-
-	if (!crtc || !crtc->state) {
-		DPU_ERROR("invalid argument(s)\n");
-		return NULL;
-	}
+	struct dpu_crtc_state *cstate, *old_cstate = 
 to_dpu_crtc_state(crtc->state);
 
-	old_cstate = to_dpu_crtc_state(crtc->state);
 	cstate = kmemdup(old_cstate, sizeof(*old_cstate), GFP_KERNEL);
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +2 -9
 	if (!cstate) {
 		DPU_ERROR("failed to allocate state\n");
@@ -754,19 +718,12 @@ static struct drm_crtc_state
 *dpu_crtc_duplicate_state(struct drm_crtc *crtc)
 static void dpu_crtc_disable(struct drm_crtc *crtc,
 			     struct drm_crtc_state *old_crtc_state)
 {
-	struct dpu_crtc *dpu_crtc;
-	struct dpu_crtc_state *cstate;
+	struct dpu_crtc *dpu_crtc = to_dpu_crtc(crtc);
+	struct dpu_crtc_state *cstate = to_dpu_crtc_state(crtc->state);
 	struct drm_encoder *encoder;
 	unsigned long flags;
 	bool release_bandwidth = false;
 
-	if (!crtc || !crtc->state) {
-		DPU_ERROR("invalid crtc\n");
-		return;
-	}
-	dpu_crtc = to_dpu_crtc(crtc);
-	cstate = to_dpu_crtc_state(crtc->state);
-
 	DRM_DEBUG_KMS("crtc%d\n", crtc->base.id);
 
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +1 -7
 	/* Disable/save vblank irq handling */
@@ -825,19 +782,13 @@ static void dpu_crtc_disable(struct drm_crtc 
 *crtc,
 static void dpu_crtc_enable(struct drm_crtc *crtc,
 		struct drm_crtc_state *old_crtc_state)
 {
-	struct dpu_crtc *dpu_crtc;
+	struct dpu_crtc *dpu_crtc = to_dpu_crtc(crtc);
 	struct drm_encoder *encoder;
 	bool request_bandwidth = false;
 
-	if (!crtc) {
-		DPU_ERROR("invalid crtc\n");
-		return;
-	}
-
 	pm_runtime_get_sync(crtc->dev->dev);
 
 	DRM_DEBUG_KMS("crtc%d\n", crtc->base.id);
-	dpu_crtc = to_dpu_crtc(crtc);
 
 	drm_for_each_encoder_mask(encoder, crtc->dev, 

crtc->state->encoder_mask) {

drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +2 -10
 		/* in video mode, we hold an extra bandwidth reference
@@ -873,9 +824,9 @@ struct plane_state {
 static int dpu_crtc_atomic_check(struct drm_crtc *crtc,
 		struct drm_crtc_state *state)
 {
-	struct dpu_crtc *dpu_crtc;
+	struct dpu_crtc *dpu_crtc = to_dpu_crtc(crtc);
+	struct dpu_crtc_state *cstate = to_dpu_crtc_state(state);
 	struct plane_state *pstates;
-	struct dpu_crtc_state *cstate;
 
 	const struct drm_plane_state *pstate;
 	struct drm_plane *plane;
@@ -889,16 +840,8 @@ static int dpu_crtc_atomic_check(struct drm_crtc 
 *crtc,
 	int left_zpos_cnt = 0, right_zpos_cnt = 0;
 	struct drm_rect crtc_rect = { 0 };
 
-	if (!crtc) {
-		DPU_ERROR("invalid crtc\n");
-		return -EINVAL;
-	}
-
 	pstates = kzalloc(sizeof(*pstates) * DPU_STAGE_MAX * 4, GFP_KERNEL);
 
-	dpu_crtc = to_dpu_crtc(crtc);
-	cstate = to_dpu_crtc_state(state);
-
 	if (!state->enable || !state->active) {
 		DPU_DEBUG("crtc%d -> enable %d, active %d, skip atomic_check\n",
Quoted 1 line

crtc->base.id, state->enable, state->active);

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

author
#6 lore raw

Re: [PATCH 2/2] drm/msm/dpu: clean up some impossibilities

In reply to a message not in the archive
Quoted 81 lines · On Tue, Sep 8, 2020 at 12:44 PM <[email protected]> wrote:
Quoted 62 lines · Rob Clark

From: Rob Clark <[email protected]>

---
 drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 81 ++++--------------------
 1 file changed, 12 insertions(+), 69 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +0 -5
index 89c0245b5de5..ad49b0e17fcb 100644
@@ -265,11 +265,6 @@ enum dpu_intf_mode dpu_crtc_get_intf_mode(struct
 drm_crtc *crtc)
 {
      struct drm_encoder *encoder;
 
-     if (!crtc) {
-             DPU_ERROR("invalid crtc\n");
-             return INTF_MODE_NONE;
-     }
-
      /*
       * TODO: This function is called from dpu debugfs and as part of

atomic
* check. When called from debugfs, the crtc->mutex must be held to

drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +0 -6
@@ -500,12 +495,6 @@ static void dpu_crtc_atomic_begin(struct drm_crtc
 *crtc,
      struct dpu_crtc_state *cstate;
      struct drm_encoder *encoder;
      struct drm_device *dev;
-     unsigned long flags;
-
-     if (!crtc) {
-             DPU_ERROR("invalid crtc\n");
-             return;
-     }
 
      if (!crtc->state->enable) {
              DPU_DEBUG("crtc%d -> enable %d, skip atomic_begin\n",
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +0 -9
@@ -521,15 +510,6 @@ static void dpu_crtc_atomic_begin(struct drm_crtc
 *crtc,
 
      _dpu_crtc_setup_lm_bounds(crtc, crtc->state);
 
-     if (dpu_crtc->event) {
-             WARN_ON(dpu_crtc->event);
-     } else {
-             spin_lock_irqsave(&dev->event_lock, flags);
-             dpu_crtc->event = crtc->state->event;
-             crtc->state->event = NULL;
-             spin_unlock_irqrestore(&dev->event_lock, flags);
-     }
-
      /* encoder will trigger pending mask now */
      drm_for_each_encoder_mask(encoder, crtc->dev,

crtc->state->encoder_mask)

              dpu_encoder_trigger_kickoff_pending(encoder);
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +0 -0
@@ -583,14 +563,11 @@ static void dpu_crtc_atomic_flush(struct drm_crtc
 *crtc,
              return;
      }

drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c static void dpu_crtc_atomic_flush(struct drm_crtc · line 567

Quoted 10 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +1 -8
 
-     if (dpu_crtc->event) {
-             DPU_DEBUG("already received dpu_crtc->event\n");
-     } else {
-             spin_lock_irqsave(&dev->event_lock, flags);
-             dpu_crtc->event = crtc->state->event;
-             crtc->state->event = NULL;
-             spin_unlock_irqrestore(&dev->event_lock, flags);
-     }
+     WARN_ON(dpu_crtc->event);

before the patch "move vblank events to complete_commit()", the dpu_crtc events
were consumed in the _dpu_crtc_complete_flip(). So there was a chance that if the vblank event
did not come in time before the next commit, dpu_crtc->event will not be consumed.

Quoted 5 lines

But after the patch, _dpu_crtc_complete_flip() is being signaled in dpu_crtc_complete_commit()
which will always happen, so is there any case where we will hit this warning at all or will this
catch some other condition?

The core drm-atomic bits will reject an incoming atomic update if the previous one has not completed, so other than a coding bug, this WARN_ON() should not be hit.. it's only purpose is to make it very obvious if someone breaks something :-)

BR,
-R

Quoted 113 lines
Quoted 113 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +4 -0
+     spin_lock_irqsave(&dev->event_lock, flags);
+     dpu_crtc->event = crtc->state->event;
+     crtc->state->event = NULL;
+     spin_unlock_irqrestore(&dev->event_lock, flags);
 
      /*

* If no mixers has been allocated in dpu_crtc_atomic_check(),

drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +2 -15
@@ -635,14 +612,7 @@ static void dpu_crtc_atomic_flush(struct drm_crtc
 *crtc,
 static void dpu_crtc_destroy_state(struct drm_crtc *crtc,
              struct drm_crtc_state *state)
 {
-     struct dpu_crtc_state *cstate;
-
-     if (!crtc || !state) {
-             DPU_ERROR("invalid argument(s)\n");
-             return;
-     }
-
-     cstate = to_dpu_crtc_state(state);
+     struct dpu_crtc_state *cstate = to_dpu_crtc_state(state);
 
      DPU_DEBUG("crtc%d\n", crtc->base.id);
@@ -731,14 +701,8 @@ static void dpu_crtc_reset(struct drm_crtc *crtc)
  */
 static struct drm_crtc_state *dpu_crtc_duplicate_state(struct drm_crtc
 *crtc)
 {
-     struct dpu_crtc_state *cstate, *old_cstate;
-
-     if (!crtc || !crtc->state) {
-             DPU_ERROR("invalid argument(s)\n");
-             return NULL;
-     }
+     struct dpu_crtc_state *cstate, *old_cstate =
 to_dpu_crtc_state(crtc->state);
 
-     old_cstate = to_dpu_crtc_state(crtc->state);
      cstate = kmemdup(old_cstate, sizeof(*old_cstate), GFP_KERNEL);
      if (!cstate) {
              DPU_ERROR("failed to allocate state\n");
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +2 -9
@@ -754,19 +718,12 @@ static struct drm_crtc_state
 *dpu_crtc_duplicate_state(struct drm_crtc *crtc)
 static void dpu_crtc_disable(struct drm_crtc *crtc,
                           struct drm_crtc_state *old_crtc_state)
 {
-     struct dpu_crtc *dpu_crtc;
-     struct dpu_crtc_state *cstate;
+     struct dpu_crtc *dpu_crtc = to_dpu_crtc(crtc);
+     struct dpu_crtc_state *cstate = to_dpu_crtc_state(crtc->state);
      struct drm_encoder *encoder;
      unsigned long flags;
      bool release_bandwidth = false;
 
-     if (!crtc || !crtc->state) {
-             DPU_ERROR("invalid crtc\n");
-             return;
-     }
-     dpu_crtc = to_dpu_crtc(crtc);
-     cstate = to_dpu_crtc_state(crtc->state);
-
      DRM_DEBUG_KMS("crtc%d\n", crtc->base.id);
 
      /* Disable/save vblank irq handling */
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +1 -7
@@ -825,19 +782,13 @@ static void dpu_crtc_disable(struct drm_crtc
 *crtc,
 static void dpu_crtc_enable(struct drm_crtc *crtc,
              struct drm_crtc_state *old_crtc_state)
 {
-     struct dpu_crtc *dpu_crtc;
+     struct dpu_crtc *dpu_crtc = to_dpu_crtc(crtc);
      struct drm_encoder *encoder;
      bool request_bandwidth = false;
 
-     if (!crtc) {
-             DPU_ERROR("invalid crtc\n");
-             return;
-     }
-
      pm_runtime_get_sync(crtc->dev->dev);
 
      DRM_DEBUG_KMS("crtc%d\n", crtc->base.id);
-     dpu_crtc = to_dpu_crtc(crtc);
 
      drm_for_each_encoder_mask(encoder, crtc->dev,
crtc->state->encoder_mask) {
              /* in video mode, we hold an extra bandwidth reference
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +2 -7
@@ -873,9 +824,9 @@ struct plane_state {
 static int dpu_crtc_atomic_check(struct drm_crtc *crtc,
              struct drm_crtc_state *state)
 {
-     struct dpu_crtc *dpu_crtc;
+     struct dpu_crtc *dpu_crtc = to_dpu_crtc(crtc);
+     struct dpu_crtc_state *cstate = to_dpu_crtc_state(state);
      struct plane_state *pstates;
-     struct dpu_crtc_state *cstate;
 
      const struct drm_plane_state *pstate;
      struct drm_plane *plane;
@@ -889,16 +840,8 @@ static int dpu_crtc_atomic_check(struct drm_crtc
 *crtc,
      int left_zpos_cnt = 0, right_zpos_cnt = 0;
      struct drm_rect crtc_rect = { 0 };
 
-     if (!crtc) {
-             DPU_ERROR("invalid crtc\n");
-             return -EINVAL;
-     }
-
      pstates = kzalloc(sizeof(*pstates) * DPU_STAGE_MAX * 4, GFP_KERNEL);
 
Quoted 6 lines
Quoted 6 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +0 -3
-     dpu_crtc = to_dpu_crtc(crtc);
-     cstate = to_dpu_crtc_state(state);
-
      if (!state->enable || !state->active) {
              DPU_DEBUG("crtc%d -> enable %d, active %d, skip atomic_check\n",
                              crtc->base.id, state->enable, state->active);

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Reviewed-by
#7 lore raw

Re: [PATCH 2/2] drm/msm/dpu: clean up some impossibilities

Quoted 6 lines · Rob Clark
Quoted 5 lines · On Tue, Sep 8, 2020 at 12:44 PM <[email protected]> wrote:
Quoted 3 lines · Rob Clark

From: Rob Clark <[email protected]>

Quoted 213 lines
Quoted 76 lines
Quoted 59 lines
---
 drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 81 ++++--------------------
 1 file changed, 12 insertions(+), 69 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +0 -5
index 89c0245b5de5..ad49b0e17fcb 100644
@@ -265,11 +265,6 @@ enum dpu_intf_mode dpu_crtc_get_intf_mode(struct
 drm_crtc *crtc)
 {
      struct drm_encoder *encoder;
 
-     if (!crtc) {
-             DPU_ERROR("invalid crtc\n");
-             return INTF_MODE_NONE;
-     }
-
      /*
       * TODO: This function is called from dpu debugfs and as part of

atomic
* check. When called from debugfs, the crtc->mutex must be held to

drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +0 -6
@@ -500,12 +495,6 @@ static void dpu_crtc_atomic_begin(struct drm_crtc
 *crtc,
      struct dpu_crtc_state *cstate;
      struct drm_encoder *encoder;
      struct drm_device *dev;
-     unsigned long flags;
-
-     if (!crtc) {
-             DPU_ERROR("invalid crtc\n");
-             return;
-     }
 
      if (!crtc->state->enable) {
              DPU_DEBUG("crtc%d -> enable %d, skip atomic_begin\n",
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +0 -9
@@ -521,15 +510,6 @@ static void dpu_crtc_atomic_begin(struct drm_crtc
 *crtc,
 
      _dpu_crtc_setup_lm_bounds(crtc, crtc->state);
 
-     if (dpu_crtc->event) {
-             WARN_ON(dpu_crtc->event);
-     } else {
-             spin_lock_irqsave(&dev->event_lock, flags);
-             dpu_crtc->event = crtc->state->event;
-             crtc->state->event = NULL;
-             spin_unlock_irqrestore(&dev->event_lock, flags);
-     }
-
      /* encoder will trigger pending mask now */
      drm_for_each_encoder_mask(encoder, crtc->dev,

crtc->state->encoder_mask)

              dpu_encoder_trigger_kickoff_pending(encoder);
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +0 -0
@@ -583,14 +563,11 @@ static void dpu_crtc_atomic_flush(struct drm_crtc
 *crtc,
              return;
      }

drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c static void dpu_crtc_atomic_flush(struct drm_crtc · line 567

Quoted 10 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +1 -8
 
-     if (dpu_crtc->event) {
-             DPU_DEBUG("already received dpu_crtc->event\n");
-     } else {
-             spin_lock_irqsave(&dev->event_lock, flags);
-             dpu_crtc->event = crtc->state->event;
-             crtc->state->event = NULL;
-             spin_unlock_irqrestore(&dev->event_lock, flags);
-     }
+     WARN_ON(dpu_crtc->event);

before the patch "move vblank events to complete_commit()", the dpu_crtc events
were consumed in the _dpu_crtc_complete_flip(). So there was a chance that if the vblank event
did not come in time before the next commit, dpu_crtc->event will not be consumed.

Quoted 5 lines

But after the patch, _dpu_crtc_complete_flip() is being signaled in dpu_crtc_complete_commit()
which will always happen, so is there any case where we will hit this warning at all or will this
catch some other condition?

The core drm-atomic bits will reject an incoming atomic update if the previous one has not completed, so other than a coding bug, this WARN_ON() should not be hit.. it's only purpose is to make it very obvious if someone breaks something :-)

BR,
-R

Quoted 113 lines
Quoted 113 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +4 -0
+     spin_lock_irqsave(&dev->event_lock, flags);
+     dpu_crtc->event = crtc->state->event;
+     crtc->state->event = NULL;
+     spin_unlock_irqrestore(&dev->event_lock, flags);
 
      /*

* If no mixers has been allocated in dpu_crtc_atomic_check(),

drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +2 -15
@@ -635,14 +612,7 @@ static void dpu_crtc_atomic_flush(struct drm_crtc
 *crtc,
 static void dpu_crtc_destroy_state(struct drm_crtc *crtc,
              struct drm_crtc_state *state)
 {
-     struct dpu_crtc_state *cstate;
-
-     if (!crtc || !state) {
-             DPU_ERROR("invalid argument(s)\n");
-             return;
-     }
-
-     cstate = to_dpu_crtc_state(state);
+     struct dpu_crtc_state *cstate = to_dpu_crtc_state(state);
 
      DPU_DEBUG("crtc%d\n", crtc->base.id);
@@ -731,14 +701,8 @@ static void dpu_crtc_reset(struct drm_crtc *crtc)
  */
 static struct drm_crtc_state *dpu_crtc_duplicate_state(struct drm_crtc
 *crtc)
 {
-     struct dpu_crtc_state *cstate, *old_cstate;
-
-     if (!crtc || !crtc->state) {
-             DPU_ERROR("invalid argument(s)\n");
-             return NULL;
-     }
+     struct dpu_crtc_state *cstate, *old_cstate =
 to_dpu_crtc_state(crtc->state);
 
-     old_cstate = to_dpu_crtc_state(crtc->state);
      cstate = kmemdup(old_cstate, sizeof(*old_cstate), GFP_KERNEL);
      if (!cstate) {
              DPU_ERROR("failed to allocate state\n");
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +2 -9
@@ -754,19 +718,12 @@ static struct drm_crtc_state
 *dpu_crtc_duplicate_state(struct drm_crtc *crtc)
 static void dpu_crtc_disable(struct drm_crtc *crtc,
                           struct drm_crtc_state *old_crtc_state)
 {
-     struct dpu_crtc *dpu_crtc;
-     struct dpu_crtc_state *cstate;
+     struct dpu_crtc *dpu_crtc = to_dpu_crtc(crtc);
+     struct dpu_crtc_state *cstate = to_dpu_crtc_state(crtc->state);
      struct drm_encoder *encoder;
      unsigned long flags;
      bool release_bandwidth = false;
 
-     if (!crtc || !crtc->state) {
-             DPU_ERROR("invalid crtc\n");
-             return;
-     }
-     dpu_crtc = to_dpu_crtc(crtc);
-     cstate = to_dpu_crtc_state(crtc->state);
-
      DRM_DEBUG_KMS("crtc%d\n", crtc->base.id);
 
      /* Disable/save vblank irq handling */
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +1 -7
@@ -825,19 +782,13 @@ static void dpu_crtc_disable(struct drm_crtc
 *crtc,
 static void dpu_crtc_enable(struct drm_crtc *crtc,
              struct drm_crtc_state *old_crtc_state)
 {
-     struct dpu_crtc *dpu_crtc;
+     struct dpu_crtc *dpu_crtc = to_dpu_crtc(crtc);
      struct drm_encoder *encoder;
      bool request_bandwidth = false;
 
-     if (!crtc) {
-             DPU_ERROR("invalid crtc\n");
-             return;
-     }
-
      pm_runtime_get_sync(crtc->dev->dev);
 
      DRM_DEBUG_KMS("crtc%d\n", crtc->base.id);
-     dpu_crtc = to_dpu_crtc(crtc);
 
      drm_for_each_encoder_mask(encoder, crtc->dev,
crtc->state->encoder_mask) {
              /* in video mode, we hold an extra bandwidth reference
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +2 -7
@@ -873,9 +824,9 @@ struct plane_state {
 static int dpu_crtc_atomic_check(struct drm_crtc *crtc,
              struct drm_crtc_state *state)
 {
-     struct dpu_crtc *dpu_crtc;
+     struct dpu_crtc *dpu_crtc = to_dpu_crtc(crtc);
+     struct dpu_crtc_state *cstate = to_dpu_crtc_state(state);
      struct plane_state *pstates;
-     struct dpu_crtc_state *cstate;
 
      const struct drm_plane_state *pstate;
      struct drm_plane *plane;
@@ -889,16 +840,8 @@ static int dpu_crtc_atomic_check(struct drm_crtc
 *crtc,
      int left_zpos_cnt = 0, right_zpos_cnt = 0;
      struct drm_rect crtc_rect = { 0 };
 
-     if (!crtc) {
-             DPU_ERROR("invalid crtc\n");
-             return -EINVAL;
-     }
-
      pstates = kzalloc(sizeof(*pstates) * DPU_STAGE_MAX * 4, GFP_KERNEL);
 
Quoted 6 lines
Quoted 6 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +0 -3
-     dpu_crtc = to_dpu_crtc(crtc);
-     cstate = to_dpu_crtc_state(state);
-
      if (!state->enable || !state->active) {
              DPU_DEBUG("crtc%d -> enable %d, active %d, skip atomic_check\n",
                              crtc->base.id, state->enable, state->active);

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Reviewed-by
#8 lore raw

Re: [PATCH 2/2] drm/msm/dpu: clean up some impossibilities

In reply to Rob Clark
Quoted 6 lines · Rob Clark
Quoted 5 lines · On Tue, Sep 8, 2020 at 12:44 PM <[email protected]> wrote:
Quoted 3 lines · Rob Clark

From: Rob Clark <[email protected]>

Quoted 203 lines
Quoted 76 lines
Quoted 59 lines
---
 drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 81 ++++--------------------
 1 file changed, 12 insertions(+), 69 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +0 -5
index 89c0245b5de5..ad49b0e17fcb 100644
@@ -265,11 +265,6 @@ enum dpu_intf_mode dpu_crtc_get_intf_mode(struct
 drm_crtc *crtc)
 {
      struct drm_encoder *encoder;
 
-     if (!crtc) {
-             DPU_ERROR("invalid crtc\n");
-             return INTF_MODE_NONE;
-     }
-
      /*
       * TODO: This function is called from dpu debugfs and as part of

atomic
* check. When called from debugfs, the crtc->mutex must be held to

drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +0 -6
@@ -500,12 +495,6 @@ static void dpu_crtc_atomic_begin(struct drm_crtc
 *crtc,
      struct dpu_crtc_state *cstate;
      struct drm_encoder *encoder;
      struct drm_device *dev;
-     unsigned long flags;
-
-     if (!crtc) {
-             DPU_ERROR("invalid crtc\n");
-             return;
-     }
 
      if (!crtc->state->enable) {
              DPU_DEBUG("crtc%d -> enable %d, skip atomic_begin\n",
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +0 -9
@@ -521,15 +510,6 @@ static void dpu_crtc_atomic_begin(struct drm_crtc
 *crtc,
 
      _dpu_crtc_setup_lm_bounds(crtc, crtc->state);
 
-     if (dpu_crtc->event) {
-             WARN_ON(dpu_crtc->event);
-     } else {
-             spin_lock_irqsave(&dev->event_lock, flags);
-             dpu_crtc->event = crtc->state->event;
-             crtc->state->event = NULL;
-             spin_unlock_irqrestore(&dev->event_lock, flags);
-     }
-
      /* encoder will trigger pending mask now */
      drm_for_each_encoder_mask(encoder, crtc->dev,

crtc->state->encoder_mask)

              dpu_encoder_trigger_kickoff_pending(encoder);
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +0 -0
@@ -583,14 +563,11 @@ static void dpu_crtc_atomic_flush(struct drm_crtc
 *crtc,
              return;
      }

drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c static void dpu_crtc_atomic_flush(struct drm_crtc · line 567

Quoted 10 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +1 -8
 
-     if (dpu_crtc->event) {
-             DPU_DEBUG("already received dpu_crtc->event\n");
-     } else {
-             spin_lock_irqsave(&dev->event_lock, flags);
-             dpu_crtc->event = crtc->state->event;
-             crtc->state->event = NULL;
-             spin_unlock_irqrestore(&dev->event_lock, flags);
-     }
+     WARN_ON(dpu_crtc->event);

before the patch "move vblank events to complete_commit()", the dpu_crtc events
were consumed in the _dpu_crtc_complete_flip(). So there was a chance that if the vblank event
did not come in time before the next commit, dpu_crtc->event will not be consumed.

Quoted 5 lines

But after the patch, _dpu_crtc_complete_flip() is being signaled in dpu_crtc_complete_commit()
which will always happen, so is there any case where we will hit this warning at all or will this
catch some other condition?

The core drm-atomic bits will reject an incoming atomic update if the previous one has not completed, so other than a coding bug, this WARN_ON() should not be hit.. it's only purpose is to make it very obvious if someone breaks something :-)

BR,
-R

Quoted 113 lines
Quoted 113 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +4 -0
+     spin_lock_irqsave(&dev->event_lock, flags);
+     dpu_crtc->event = crtc->state->event;
+     crtc->state->event = NULL;
+     spin_unlock_irqrestore(&dev->event_lock, flags);
 
      /*

* If no mixers has been allocated in dpu_crtc_atomic_check(),

drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +2 -15
@@ -635,14 +612,7 @@ static void dpu_crtc_atomic_flush(struct drm_crtc
 *crtc,
 static void dpu_crtc_destroy_state(struct drm_crtc *crtc,
              struct drm_crtc_state *state)
 {
-     struct dpu_crtc_state *cstate;
-
-     if (!crtc || !state) {
-             DPU_ERROR("invalid argument(s)\n");
-             return;
-     }
-
-     cstate = to_dpu_crtc_state(state);
+     struct dpu_crtc_state *cstate = to_dpu_crtc_state(state);
 
      DPU_DEBUG("crtc%d\n", crtc->base.id);
@@ -731,14 +701,8 @@ static void dpu_crtc_reset(struct drm_crtc *crtc)
  */
 static struct drm_crtc_state *dpu_crtc_duplicate_state(struct drm_crtc
 *crtc)
 {
-     struct dpu_crtc_state *cstate, *old_cstate;
-
-     if (!crtc || !crtc->state) {
-             DPU_ERROR("invalid argument(s)\n");
-             return NULL;
-     }
+     struct dpu_crtc_state *cstate, *old_cstate =
 to_dpu_crtc_state(crtc->state);
 
-     old_cstate = to_dpu_crtc_state(crtc->state);
      cstate = kmemdup(old_cstate, sizeof(*old_cstate), GFP_KERNEL);
      if (!cstate) {
              DPU_ERROR("failed to allocate state\n");
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +2 -9
@@ -754,19 +718,12 @@ static struct drm_crtc_state
 *dpu_crtc_duplicate_state(struct drm_crtc *crtc)
 static void dpu_crtc_disable(struct drm_crtc *crtc,
                           struct drm_crtc_state *old_crtc_state)
 {
-     struct dpu_crtc *dpu_crtc;
-     struct dpu_crtc_state *cstate;
+     struct dpu_crtc *dpu_crtc = to_dpu_crtc(crtc);
+     struct dpu_crtc_state *cstate = to_dpu_crtc_state(crtc->state);
      struct drm_encoder *encoder;
      unsigned long flags;
      bool release_bandwidth = false;
 
-     if (!crtc || !crtc->state) {
-             DPU_ERROR("invalid crtc\n");
-             return;
-     }
-     dpu_crtc = to_dpu_crtc(crtc);
-     cstate = to_dpu_crtc_state(crtc->state);
-
      DRM_DEBUG_KMS("crtc%d\n", crtc->base.id);
 
      /* Disable/save vblank irq handling */
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +1 -7
@@ -825,19 +782,13 @@ static void dpu_crtc_disable(struct drm_crtc
 *crtc,
 static void dpu_crtc_enable(struct drm_crtc *crtc,
              struct drm_crtc_state *old_crtc_state)
 {
-     struct dpu_crtc *dpu_crtc;
+     struct dpu_crtc *dpu_crtc = to_dpu_crtc(crtc);
      struct drm_encoder *encoder;
      bool request_bandwidth = false;
 
-     if (!crtc) {
-             DPU_ERROR("invalid crtc\n");
-             return;
-     }
-
      pm_runtime_get_sync(crtc->dev->dev);
 
      DRM_DEBUG_KMS("crtc%d\n", crtc->base.id);
-     dpu_crtc = to_dpu_crtc(crtc);
 
      drm_for_each_encoder_mask(encoder, crtc->dev,
crtc->state->encoder_mask) {
              /* in video mode, we hold an extra bandwidth reference
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +2 -7
@@ -873,9 +824,9 @@ struct plane_state {
 static int dpu_crtc_atomic_check(struct drm_crtc *crtc,
              struct drm_crtc_state *state)
 {
-     struct dpu_crtc *dpu_crtc;
+     struct dpu_crtc *dpu_crtc = to_dpu_crtc(crtc);
+     struct dpu_crtc_state *cstate = to_dpu_crtc_state(state);
      struct plane_state *pstates;
-     struct dpu_crtc_state *cstate;
 
      const struct drm_plane_state *pstate;
      struct drm_plane *plane;
@@ -889,16 +840,8 @@ static int dpu_crtc_atomic_check(struct drm_crtc
 *crtc,
      int left_zpos_cnt = 0, right_zpos_cnt = 0;
      struct drm_rect crtc_rect = { 0 };
 
-     if (!crtc) {
-             DPU_ERROR("invalid crtc\n");
-             return -EINVAL;
-     }
-
      pstates = kzalloc(sizeof(*pstates) * DPU_STAGE_MAX * 4, GFP_KERNEL);
 
Quoted 10 lines
Quoted 6 lines
Quoted 6 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +0 -3
-     dpu_crtc = to_dpu_crtc(crtc);
-     cstate = to_dpu_crtc_state(state);
-
      if (!state->enable || !state->active) {
              DPU_DEBUG("crtc%d -> enable %d, active %d, skip atomic_check\n",
                              crtc->base.id, state->enable, state->active);

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel