* [PATCH 1/2] drm/msm/dpu: move vblank events to complete_commit()
@ 2020-09-07 17:04 ` Rob Clark
0 siblings, 0 replies; 14+ messages in thread
From: Rob Clark @ 2020-09-07 17:04 UTC (permalink / raw)
To: dri-devel
Cc: linux-arm-msm, freedreno, Rob Clark, Rob Clark, Sean Paul,
David Airlie, Daniel Vetter, Drew Davenport, Kalyan Thota,
Hongbo Yao, Bernard, open list
From: Rob Clark <robdclark@chromium.org>
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.
Signed-off-by: Rob Clark <robdclark@chromium.org>
---
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
index c2729f71e2fa..89c0245b5de5 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
@@ -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,
--
2.26.2
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 1/2] drm/msm/dpu: move vblank events to complete_commit()
@ 2020-09-07 17:04 ` Rob Clark
0 siblings, 0 replies; 14+ messages in thread
From: Rob Clark @ 2020-09-07 17:04 UTC (permalink / raw)
To: dri-devel
Cc: Rob Clark, David Airlie, linux-arm-msm, Hongbo Yao, open list,
Bernard, Sean Paul, Kalyan Thota, Drew Davenport, freedreno
From: Rob Clark <robdclark@chromium.org>
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.
Signed-off-by: Rob Clark <robdclark@chromium.org>
---
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
index c2729f71e2fa..89c0245b5de5 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
@@ -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,
--
2.26.2
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 2/2] drm/msm/dpu: clean up some impossibilities
2020-09-07 17:04 ` Rob Clark
@ 2020-09-07 17:04 ` Rob Clark
-1 siblings, 0 replies; 14+ messages in thread
From: Rob Clark @ 2020-09-07 17:04 UTC (permalink / raw)
To: dri-devel
Cc: linux-arm-msm, freedreno, Rob Clark, Rob Clark, Sean Paul,
David Airlie, Daniel Vetter, Drew Davenport, Kalyan Thota,
Thomas Zimmermann, Hongbo Yao, open list
From: Rob Clark <robdclark@chromium.org>
Signed-off-by: Rob Clark <robdclark@chromium.org>
---
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 81 ++++--------------------
1 file changed, 12 insertions(+), 69 deletions(-)
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
index 89c0245b5de5..ad49b0e17fcb 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
@@ -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);
--
2.26.2
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH 2/2] drm/msm/dpu: clean up some impossibilities
@ 2020-09-07 17:04 ` Rob Clark
0 siblings, 0 replies; 14+ messages in thread
From: Rob Clark @ 2020-09-07 17:04 UTC (permalink / raw)
To: dri-devel
Cc: Rob Clark, Thomas Zimmermann, David Airlie, linux-arm-msm,
Hongbo Yao, open list, Sean Paul, Kalyan Thota, Drew Davenport,
freedreno
From: Rob Clark <robdclark@chromium.org>
Signed-off-by: Rob Clark <robdclark@chromium.org>
---
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 81 ++++--------------------
1 file changed, 12 insertions(+), 69 deletions(-)
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
index 89c0245b5de5..ad49b0e17fcb 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
@@ -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);
--
2.26.2
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [PATCH 2/2] drm/msm/dpu: clean up some impossibilities
2020-09-07 17:04 ` Rob Clark
@ 2020-09-08 0:27 ` kernel test robot
-1 siblings, 0 replies; 14+ messages in thread
From: kernel test robot @ 2020-09-08 0:27 UTC (permalink / raw)
To: Rob Clark, dri-devel
Cc: Rob Clark, kbuild-all, David Airlie, linux-arm-msm, Hongbo Yao,
open list, Thomas Zimmermann, Kalyan Thota, Drew Davenport,
Sean Paul
[-- Attachment #1: Type: text/plain, Size: 6086 bytes --]
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
Reported-by: kernel test robot <lkp@intel.com>
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@lists.01.org
[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 53198 bytes --]
[-- Attachment #3: Type: text/plain, Size: 160 bytes --]
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 2/2] drm/msm/dpu: clean up some impossibilities
@ 2020-09-08 0:27 ` kernel test robot
0 siblings, 0 replies; 14+ messages in thread
From: kernel test robot @ 2020-09-08 0:27 UTC (permalink / raw)
To: kbuild-all
[-- Attachment #1: Type: text/plain, Size: 6184 bytes --]
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
Reported-by: kernel test robot <lkp@intel.com>
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
[-- Attachment #2: config.gz --]
[-- Type: application/gzip, Size: 53198 bytes --]
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 1/2] drm/msm/dpu: move vblank events to complete_commit()
2020-09-07 17:04 ` Rob Clark
` (2 preceding siblings ...)
(?)
@ 2020-09-08 19:06 ` abhinavk
-1 siblings, 0 replies; 14+ messages in thread
From: abhinavk @ 2020-09-08 19:06 UTC (permalink / raw)
To: Rob Clark
Cc: dri-devel, linux-arm-msm, freedreno, Rob Clark, Sean Paul,
David Airlie, Daniel Vetter, Drew Davenport, Kalyan Thota,
Hongbo Yao, Bernard, linux-kernel, linux-arm-msm-owner
On 2020-09-07 10:04, Rob Clark wrote:
> From: Rob Clark <robdclark@chromium.org>
>
> 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.
>
> Signed-off-by: Rob Clark <robdclark@chromium.org>
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,
Reviewed-by: Abhinav Kumar <abhinavk@codeaurora.org>
> ---
> drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
> b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
> index c2729f71e2fa..89c0245b5de5 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
> @@ -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,
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 1/2] drm/msm/dpu: move vblank events to complete_commit()
2020-09-07 17:04 ` Rob Clark
(?)
(?)
@ 2020-09-08 19:06 ` abhinavk
-1 siblings, 0 replies; 14+ messages in thread
From: abhinavk @ 2020-09-08 19:06 UTC (permalink / raw)
To: Rob Clark
Cc: Rob Clark, freedreno, David Airlie, linux-arm-msm, Hongbo Yao,
linux-kernel, dri-devel, Bernard, Kalyan Thota, Drew Davenport,
Sean Paul, linux-arm-msm-owner
On 2020-09-07 10:04, Rob Clark wrote:
> From: Rob Clark <robdclark@chromium.org>
>
> 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.
>
> Signed-off-by: Rob Clark <robdclark@chromium.org>
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,
Reviewed-by: Abhinav Kumar <abhinavk@codeaurora.org>
> ---
> drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
> b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
> index c2729f71e2fa..89c0245b5de5 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
> @@ -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,
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 2/2] drm/msm/dpu: clean up some impossibilities
2020-09-07 17:04 ` Rob Clark
(?)
(?)
@ 2020-09-08 19:44 ` abhinavk
-1 siblings, 0 replies; 14+ messages in thread
From: abhinavk @ 2020-09-08 19:44 UTC (permalink / raw)
To: Rob Clark
Cc: Rob Clark, freedreno, Thomas Zimmermann, David Airlie,
linux-arm-msm, Hongbo Yao, linux-kernel, dri-devel, Kalyan Thota,
Drew Davenport, Sean Paul, linux-arm-msm-owner
On 2020-09-07 10:04, Rob Clark wrote:
> From: Rob Clark <robdclark@chromium.org>
>
> Signed-off-by: Rob Clark <robdclark@chromium.org>
> ---
> drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 81 ++++--------------------
> 1 file changed, 12 insertions(+), 69 deletions(-)
>
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
> b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
> index 89c0245b5de5..ad49b0e17fcb 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
> @@ -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);
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?
> + 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);
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 2/2] drm/msm/dpu: clean up some impossibilities
2020-09-07 17:04 ` Rob Clark
` (2 preceding siblings ...)
(?)
@ 2020-09-08 19:44 ` abhinavk
-1 siblings, 0 replies; 14+ messages in thread
From: abhinavk @ 2020-09-08 19:44 UTC (permalink / raw)
To: Rob Clark
Cc: dri-devel, linux-arm-msm, freedreno, Rob Clark, Sean Paul,
David Airlie, Daniel Vetter, Drew Davenport, Kalyan Thota,
Thomas Zimmermann, Hongbo Yao, linux-kernel, linux-arm-msm-owner
On 2020-09-07 10:04, Rob Clark wrote:
> From: Rob Clark <robdclark@chromium.org>
>
> Signed-off-by: Rob Clark <robdclark@chromium.org>
> ---
> drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 81 ++++--------------------
> 1 file changed, 12 insertions(+), 69 deletions(-)
>
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
> b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
> index 89c0245b5de5..ad49b0e17fcb 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
> @@ -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);
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?
> + 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);
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 2/2] drm/msm/dpu: clean up some impossibilities
[not found] ` <010101746f3f7667-5ee2e9e4-9b10-41e0-8bbc-65219583cb86-000000@us-west-2.amazonses.com>
@ 2020-09-08 20:11 ` Rob Clark
0 siblings, 0 replies; 14+ messages in thread
From: Rob Clark @ 2020-09-08 20:11 UTC (permalink / raw)
To: Abhinav Kumar
Cc: dri-devel, linux-arm-msm, freedreno, Rob Clark, Sean Paul,
David Airlie, Daniel Vetter, Drew Davenport, Kalyan Thota,
Thomas Zimmermann, Hongbo Yao, Linux Kernel Mailing List,
linux-arm-msm-owner
On Tue, Sep 8, 2020 at 12:44 PM <abhinavk@codeaurora.org> wrote:
>
> On 2020-09-07 10:04, Rob Clark wrote:
> > From: Rob Clark <robdclark@chromium.org>
> >
> > Signed-off-by: Rob Clark <robdclark@chromium.org>
> > ---
> > drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 81 ++++--------------------
> > 1 file changed, 12 insertions(+), 69 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
> > b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
> > index 89c0245b5de5..ad49b0e17fcb 100644
> > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
> > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
> > @@ -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);
> 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?
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
>
> > + 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);
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 2/2] drm/msm/dpu: clean up some impossibilities
@ 2020-09-08 20:11 ` Rob Clark
0 siblings, 0 replies; 14+ messages in thread
From: Rob Clark @ 2020-09-08 20:11 UTC (permalink / raw)
To: Abhinav Kumar
Cc: Rob Clark, freedreno, Thomas Zimmermann, David Airlie,
linux-arm-msm, Hongbo Yao, Linux Kernel Mailing List, dri-devel,
Kalyan Thota, Drew Davenport, Sean Paul, linux-arm-msm-owner
On Tue, Sep 8, 2020 at 12:44 PM <abhinavk@codeaurora.org> wrote:
>
> On 2020-09-07 10:04, Rob Clark wrote:
> > From: Rob Clark <robdclark@chromium.org>
> >
> > Signed-off-by: Rob Clark <robdclark@chromium.org>
> > ---
> > drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 81 ++++--------------------
> > 1 file changed, 12 insertions(+), 69 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
> > b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
> > index 89c0245b5de5..ad49b0e17fcb 100644
> > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
> > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
> > @@ -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);
> 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?
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
>
> > + 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);
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 2/2] drm/msm/dpu: clean up some impossibilities
2020-09-08 20:11 ` Rob Clark
(?)
@ 2020-09-08 20:52 ` abhinavk
-1 siblings, 0 replies; 14+ messages in thread
From: abhinavk @ 2020-09-08 20:52 UTC (permalink / raw)
To: Rob Clark
Cc: Rob Clark, freedreno, Thomas Zimmermann, David Airlie,
linux-arm-msm, Hongbo Yao, Linux Kernel Mailing List, dri-devel,
Kalyan Thota, Drew Davenport, Sean Paul, linux-arm-msm-owner
On 2020-09-08 13:11, Rob Clark wrote:
> On Tue, Sep 8, 2020 at 12:44 PM <abhinavk@codeaurora.org> wrote:
>>
>> On 2020-09-07 10:04, Rob Clark wrote:
>> > From: Rob Clark <robdclark@chromium.org>
>> >
>> > Signed-off-by: Rob Clark <robdclark@chromium.org>
Reviewed-by: Abhinav Kumar <abhinavk@codeaurora.org>
>> > ---
>> > drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 81 ++++--------------------
>> > 1 file changed, 12 insertions(+), 69 deletions(-)
>> >
>> > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
>> > b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
>> > index 89c0245b5de5..ad49b0e17fcb 100644
>> > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
>> > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
>> > @@ -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);
>> 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?
>
> 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
>
>>
>> > + 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);
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 2/2] drm/msm/dpu: clean up some impossibilities
2020-09-08 20:11 ` Rob Clark
(?)
(?)
@ 2020-09-08 20:52 ` abhinavk
-1 siblings, 0 replies; 14+ messages in thread
From: abhinavk @ 2020-09-08 20:52 UTC (permalink / raw)
To: Rob Clark
Cc: Rob Clark, David Airlie, linux-arm-msm, Hongbo Yao,
Linux Kernel Mailing List, dri-devel, Sean Paul,
Thomas Zimmermann, Kalyan Thota, Drew Davenport, freedreno,
linux-arm-msm-owner
On 2020-09-08 13:11, Rob Clark wrote:
> On Tue, Sep 8, 2020 at 12:44 PM <abhinavk@codeaurora.org> wrote:
>>
>> On 2020-09-07 10:04, Rob Clark wrote:
>> > From: Rob Clark <robdclark@chromium.org>
>> >
>> > Signed-off-by: Rob Clark <robdclark@chromium.org>
Reviewed-by: Abhinav Kumar <abhinavk@codeaurora.org>
>> > ---
>> > drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 81 ++++--------------------
>> > 1 file changed, 12 insertions(+), 69 deletions(-)
>> >
>> > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
>> > b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
>> > index 89c0245b5de5..ad49b0e17fcb 100644
>> > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
>> > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
>> > @@ -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);
>> 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?
>
> 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
>
>>
>> > + 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);
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2020-09-08 21:00 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-09-07 17:04 [PATCH 1/2] drm/msm/dpu: move vblank events to complete_commit() Rob Clark
2020-09-07 17:04 ` Rob Clark
2020-09-07 17:04 ` [PATCH 2/2] drm/msm/dpu: clean up some impossibilities Rob Clark
2020-09-07 17:04 ` Rob Clark
2020-09-08 0:27 ` kernel test robot
2020-09-08 0:27 ` kernel test robot
2020-09-08 19:44 ` abhinavk
2020-09-08 19:44 ` abhinavk
[not found] ` <010101746f3f7667-5ee2e9e4-9b10-41e0-8bbc-65219583cb86-000000@us-west-2.amazonses.com>
2020-09-08 20:11 ` Rob Clark
2020-09-08 20:11 ` Rob Clark
2020-09-08 20:52 ` abhinavk
2020-09-08 20:52 ` abhinavk
2020-09-08 19:06 ` [PATCH 1/2] drm/msm/dpu: move vblank events to complete_commit() abhinavk
2020-09-08 19:06 ` abhinavk
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.