drm/msm: stop storing the array of CRTCs in struct msm_drm_private

The array of CRTC in the struct msm_drm_private duplicates a list of
CRTCs in the drm_device. Drop it and use the existing list for CRTC
enumeration.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
Patchwork: https://patchwork.freedesktop.org/patch/538068/
Link: https://lore.kernel.org/r/20230519150734.3879916-1-dmitry.baryshkov@linaro.org

diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
index aa8499d..8440352 100644 (file)
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
@@ -794,7 +794,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 6e37072..b6201ae 100644 (file)
--- a/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c
+++ b/drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c
@@ -332,7 +332,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 323079c..92bf9d9 100644 (file)
--- 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 891eff8..45d3d14 100644 (file)
--- a/drivers/gpu/drm/msm/msm_drv.c
+++ b/drivers/gpu/drm/msm/msm_drv.c
@@ -155,7 +155,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;
 };
@@ -168,15 +168,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);
        else
-               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)
 {
        struct msm_vblank_work *vbl_work;
 
@@ -186,7 +186,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;
 
@@ -407,7 +407,8 @@ 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;
-       int ret, i;
+       struct drm_crtc *crtc;
+       int ret;
 
        if (drm_firmware_drivers_only())
                return -ENODEV;
@@ -494,20 +495,21 @@ 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) {
+               struct msm_drm_thread *ev_thread;
+
                /* initialize event thread */
-               priv->event_thread[i].crtc_id = priv->crtcs[i]->base.id;
-               priv->event_thread[i].dev = ddev;
-               priv->event_thread[i].worker = kthread_create_worker(0,
-                       "crtc_event:%d", priv->event_thread[i].crtc_id);
-               if (IS_ERR(priv->event_thread[i].worker)) {
-                       ret = PTR_ERR(priv->event_thread[i].worker);
+               ev_thread = &priv->event_thread[drm_crtc_index(crtc)];
+               ev_thread->dev = ddev;
+               ev_thread->worker = kthread_create_worker(0, "crtc_event:%d", crtc->base.id);
+               if (IS_ERR(ev_thread->worker)) {
+                       ret = PTR_ERR(ev_thread->worker);
                        DRM_DEV_ERROR(dev, "failed to create crtc_event kthread\n");
-                       priv->event_thread[i].worker = NULL;
+                       ev_thread->worker = NULL;
                        goto err_msm_uninit;
                }
 
-               sched_set_fifo(priv->event_thread[i].worker->task);
+               sched_set_fifo(ev_thread->worker->task);
        }
 
        ret = drm_vblank_init(ddev, priv->num_crtcs);
@@ -639,25 +641,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 e13a8cb..5d56ca9 100644 (file)
--- a/drivers/gpu/drm/msm/msm_drv.h
+++ b/drivers/gpu/drm/msm/msm_drv.h
@@ -97,7 +97,6 @@ struct msm_display_topology {
 /* Commit/Event thread specific structure */
 struct msm_drm_thread {
        struct drm_device *dev;
-       unsigned int crtc_id;
        struct kthread_worker *worker;
 };
 
@@ -198,7 +197,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];