sugar/linux
1
0
Fork 0
Code Activity

drm/msm: get rid of msm_drm_private::num_crtcs

Browse Source 
Drop superfluous msm_drm_private::num_crtcs in favour of using
drm_mode_config::num_crtc or MAX_CRCS as appropriate.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Patchwork: https://patchwork.freedesktop.org/patch/662578/
Signed-off-by: Rob Clark <robin.clark@oss.qualcomm.com>
This commit is contained in:
Dmitry Baryshkov
2025-07-05 13:02:29 +03:00
committed by Rob Clark
parent 9d065a3fef
commit 0bb2335f06
5 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
View File

@@ -875,12 +875,11 @@ static int _dpu_kms_drm_obj_init(struct dpu_kms *dpu_kms)
ret = PTR_ERR(crtc);
return ret;
}
priv->num_crtcs++;
}
/* All CRTCs are compatible with all encoders */
drm_for_each_encoder(encoder, dev)
encoder->possible_crtcs = (1 << priv->num_crtcs) - 1;
encoder->possible_crtcs = (1 << dev->mode_config.num_crtc) - 1;
return 0;
}

3
drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c
View File

@@ -297,7 +297,6 @@ static int mdp4_modeset_init_intf(struct mdp4_kms *mdp4_kms,
static int modeset_init(struct mdp4_kms *mdp4_kms)
{
struct drm_device *dev = mdp4_kms->dev;
struct msm_drm_private *priv = dev->dev_private;
struct drm_plane *plane;
struct drm_crtc *crtc;
int i, ret;
@@ -347,8 +346,6 @@ static int modeset_init(struct mdp4_kms *mdp4_kms)
ret = PTR_ERR(crtc);
goto fail;
}
priv->num_crtcs++;
}
/*

4
drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c
View File

@@ -375,7 +375,6 @@ static int modeset_init_intf(struct mdp5_kms *mdp5_kms,
static int modeset_init(struct mdp5_kms *mdp5_kms)
{
struct drm_device *dev = mdp5_kms->dev;
struct msm_drm_private *priv = dev->dev_private;
unsigned int num_crtcs;
int i, ret, pi = 0, ci = 0;
struct drm_plane *primary[MAX_BASES] = { NULL };
@@ -443,7 +442,6 @@ 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->num_crtcs++;
}
/*
@@ -451,7 +449,7 @@ static int modeset_init(struct mdp5_kms *mdp5_kms)
* crtcs for the encoders
*/
drm_for_each_encoder(encoder, dev)
encoder->possible_crtcs = (1 << priv->num_crtcs) - 1;
encoder->possible_crtcs = (1 << dev->mode_config.num_crtc) - 1;
return 0;

2
drivers/gpu/drm/msm/msm_drv.h
View File

@@ -175,8 +175,6 @@ struct msm_drm_private {
struct mutex lock;
} lru;
unsigned int num_crtcs;
struct msm_drm_thread event_thread[MAX_CRTCS];
struct notifier_block vmap_notifier;

4
drivers/gpu/drm/msm/msm_kms.c
View File

@@ -245,7 +245,7 @@ void msm_drm_kms_uninit(struct device *dev)
flush_workqueue(kms->wq);
/* clean up event worker threads */
for (i = 0; i < priv->num_crtcs; i++) {
for (i = 0; i < MAX_CRTCS; i++) {
if (priv->event_thread[i].worker)
kthread_destroy_worker(priv->event_thread[i].worker);
}
@@ -313,7 +313,7 @@ int msm_drm_kms_init(struct device *dev, const struct drm_driver *drv)
sched_set_fifo(ev_thread->worker->task);
}
ret = drm_vblank_init(ddev, priv->num_crtcs);
ret = drm_vblank_init(ddev, ddev->mode_config.num_crtc);
if (ret < 0) {
DRM_DEV_ERROR(dev, "failed to initialize vblank\n");
goto err_msm_uninit;