]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
drm/msm/mdp4: get rid of mdp4_crtc.id
authorDmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Sat, 5 Jul 2025 10:02:28 +0000 (13:02 +0300)
committerRob Clark <robin.clark@oss.qualcomm.com>
Sat, 5 Jul 2025 14:13:35 +0000 (07:13 -0700)
There is no reason to store CRTC id, it's a part of the drm_crtc. Drop
this member and use drm_crtc.name for the warning message.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Patchwork: https://patchwork.freedesktop.org/patch/662576/
Signed-off-by: Rob Clark <robin.clark@oss.qualcomm.com>
drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c
drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c
drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.h

index 2ee03ce2fd398be4f5b101be09c6dfb495324128..da53ca88251e7f184f4a7067fda16d6b426d3c49 100644 (file)
@@ -17,7 +17,6 @@
 struct mdp4_crtc {
        struct drm_crtc base;
        char name[8];
-       int id;
        int ovlp;
        enum mdp4_dma dma;
        bool enabled;
@@ -539,7 +538,7 @@ static void mdp4_crtc_wait_for_flush_done(struct drm_crtc *crtc)
                        mdp4_crtc->flushed_mask),
                msecs_to_jiffies(50));
        if (ret <= 0)
-               dev_warn(dev->dev, "vblank time out, crtc=%d\n", mdp4_crtc->id);
+               dev_warn(dev->dev, "vblank time out, crtc=%s\n", mdp4_crtc->base.name);
 
        mdp4_crtc->flushed_mask = 0;
 
@@ -624,7 +623,7 @@ static void mdp4_crtc_flip_cleanup(struct drm_device *dev, void *ptr)
 
 /* initialize crtc */
 struct drm_crtc *mdp4_crtc_init(struct drm_device *dev,
-               struct drm_plane *plane, int id, int ovlp_id,
+               struct drm_plane *plane, int ovlp_id,
                enum mdp4_dma dma_id)
 {
        struct drm_crtc *crtc = NULL;
@@ -639,8 +638,6 @@ struct drm_crtc *mdp4_crtc_init(struct drm_device *dev,
 
        crtc = &mdp4_crtc->base;
 
-       mdp4_crtc->id = id;
-
        mdp4_crtc->ovlp = ovlp_id;
        mdp4_crtc->dma = dma_id;
 
index 9acde91ad6c37369191e85820e58ee22892a61a5..6d938abe29ee7283de2b1535d3d0159bf09d6dff 100644 (file)
@@ -339,7 +339,7 @@ static int modeset_init(struct mdp4_kms *mdp4_kms)
                        goto fail;
                }
 
-               crtc  = mdp4_crtc_init(dev, plane, priv->num_crtcs, i,
+               crtc  = mdp4_crtc_init(dev, plane, i,
                                mdp4_crtcs[i]);
                if (IS_ERR(crtc)) {
                        DRM_DEV_ERROR(dev->dev, "failed to construct crtc for %s\n",
index f9d988076337cb6fb63af8e76be59b2eb34ab327..fb348583dc84de5c57c77fdf246894e9334af514 100644 (file)
@@ -185,7 +185,7 @@ void mdp4_crtc_set_config(struct drm_crtc *crtc, uint32_t config);
 void mdp4_crtc_set_intf(struct drm_crtc *crtc, enum mdp4_intf intf, int mixer);
 void mdp4_crtc_wait_for_commit_done(struct drm_crtc *crtc);
 struct drm_crtc *mdp4_crtc_init(struct drm_device *dev,
-               struct drm_plane *plane, int id, int ovlp_id,
+               struct drm_plane *plane, int ovlp_id,
                enum mdp4_dma dma_id);
 
 long mdp4_dtv_round_pixclk(struct drm_encoder *encoder, unsigned long rate);