On 5/7/2022 10:09 AM, Dmitry Baryshkov wrote:
Handling the array of CRTC duplicate the struct msm_drm_private duplicates a list of CRTCs in the drm_device. Drop it and use the
There seem to be two duplicates in the commit text :)
So this should just be "handling the array of CRTCs duplicates a list of of CRTCs in the drm_device.
existing list for CRTC enumeration.
Signed-off-by: Dmitry Baryshkov dmitry.baryshkov@linaro.org Reported-by: kernel test robot lkp@intel.com Signed-off-by: Dmitry Baryshkov dmitry.baryshkov@linaro.org
Changes since v1:
- Intialize the index variable in msm_drm_init() / event thread initialization.
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 2 +- drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 2 +- drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 2 +- drivers/gpu/drm/msm/msm_drv.c | 29 ++++++++++++------------ drivers/gpu/drm/msm/msm_drv.h | 3 +-- 5 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c index 2b9d931474e0..c84859fb2d9b 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c @@ -808,7 +808,7 @@ static int _dpu_kms_drm_obj_init(struct dpu_kms *dpu_kms) ret = PTR_ERR(crtc); return ret; }
priv->crtcs[priv->num_crtcs++] = crtc;
priv->num_crtcs++;}
/* All CRTCs are compatible with all encoders */
diff --git a/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c b/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c index fb48c8c19ec3..7449c1693e45 100644 --- a/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c +++ b/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c @@ -337,7 +337,7 @@ static int modeset_init(struct mdp4_kms *mdp4_kms) goto fail; }
priv->crtcs[priv->num_crtcs++] = crtc;
priv->num_crtcs++;}
/*
diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c index 3d5621a68f85..36808990f840 100644 --- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c +++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c @@ -497,7 +497,7 @@ static int modeset_init(struct mdp5_kms *mdp5_kms) DRM_DEV_ERROR(dev->dev, "failed to construct crtc %d (%d)\n", i, ret); goto fail; }
priv->crtcs[priv->num_crtcs++] = crtc;
priv->num_crtcs++;}
/*
diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index 4a3dda23e3e0..db676a142ac1 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -144,7 +144,7 @@ static void msm_irq_uninstall(struct drm_device *dev)
struct msm_vblank_work { struct work_struct work;
- int crtc_id;
- struct drm_crtc *crtc; bool enable; struct msm_drm_private *priv; };
@@ -157,15 +157,15 @@ static void vblank_ctrl_worker(struct work_struct *work) struct msm_kms *kms = priv->kms;
if (vbl_work->enable)
kms->funcs->enable_vblank(kms, priv->crtcs[vbl_work->crtc_id]);
kms->funcs->enable_vblank(kms, vbl_work->crtc);
kms->funcs->disable_vblank(kms, priv->crtcs[vbl_work->crtc_id]);
kms->funcs->disable_vblank(kms, vbl_work->crtc);kfree(vbl_work); }
static int vblank_ctrl_queue_work(struct msm_drm_private *priv,
int crtc_id, bool enable)
struct drm_crtc *crtc, bool enable)@@ -175,7 +175,7 @@ static int vblank_ctrl_queue_work(struct msm_drm_private *priv,
INIT_WORK(&vbl_work->work, vblank_ctrl_worker);
- vbl_work->crtc_id = crtc_id;
- vbl_work->crtc = crtc; vbl_work->enable = enable; vbl_work->priv = priv;
@@ -349,6 +349,7 @@ static int msm_drm_init(struct device *dev, const struct drm_driver *drv) struct msm_drm_private *priv = dev_get_drvdata(dev); struct drm_device *ddev; struct msm_kms *kms;
struct drm_crtc *crtc; int ret, i;
if (drm_firmware_drivers_only())
@@ -422,12 +423,14 @@ static int msm_drm_init(struct device *dev, const struct drm_driver *drv) ddev->mode_config.funcs = &mode_config_funcs; ddev->mode_config.helper_private = &mode_config_helper_funcs;
- for (i = 0; i < priv->num_crtcs; i++) {
- drm_for_each_crtc(crtc, ddev) {
i = drm_crtc_index(crtc);- /* initialize event thread */
priv->event_thread[i].crtc_id = priv->crtcs[i]->base.id;
priv->event_thread[i].crtc = crtc;
Do we really need 'i' here? Can't we just do priv->event_thread[drm_crtc_index(crtc)]?
priv->event_thread[i].worker = kthread_create_worker(0,
"crtc_event:%d", priv->event_thread[i].crtc_id);
"crtc_event:%d", priv->event_thread[i].crtc->base.id);@@ -558,25 +561,23 @@ static void msm_postclose(struct drm_device *dev, struct drm_file *file) int msm_crtc_enable_vblank(struct drm_crtc *crtc) { struct drm_device *dev = crtc->dev;
- unsigned int pipe = crtc->index; struct msm_drm_private *priv = dev->dev_private; struct msm_kms *kms = priv->kms; if (!kms) return -ENXIO;
- drm_dbg_vbl(dev, "crtc=%u", pipe);
- return vblank_ctrl_queue_work(priv, pipe, true);
drm_dbg_vbl(dev, "crtc=%u", crtc->base.id);
return vblank_ctrl_queue_work(priv, crtc, true); }
void msm_crtc_disable_vblank(struct drm_crtc *crtc) { struct drm_device *dev = crtc->dev;
- unsigned int pipe = crtc->index; struct msm_drm_private *priv = dev->dev_private; struct msm_kms *kms = priv->kms; if (!kms) return;
- drm_dbg_vbl(dev, "crtc=%u", pipe);
- vblank_ctrl_queue_work(priv, pipe, false);
drm_dbg_vbl(dev, "crtc=%u", crtc->base.id);
vblank_ctrl_queue_work(priv, crtc, false); }
/*
diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h index fdbaad53eb84..2ba57c575e13 100644 --- a/drivers/gpu/drm/msm/msm_drv.h +++ b/drivers/gpu/drm/msm/msm_drv.h @@ -102,7 +102,7 @@ struct msm_display_topology { /* Commit/Event thread specific structure */ struct msm_drm_thread { struct drm_device *dev;
- unsigned int crtc_id;
- struct drm_crtc *crtc; struct kthread_worker *worker; };
@@ -178,7 +178,6 @@ struct msm_drm_private { struct workqueue_struct *wq;
unsigned int num_crtcs;
struct drm_crtc *crtcs[MAX_CRTCS];
struct msm_drm_thread event_thread[MAX_CRTCS];