| Message ID | 20220909105947.6487-2-tzimmermann@suse.de (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 7221941c4f3249f6e67090820c827326e2e4459f |
| Delegated to: | Kieran Bingham |
| Headers | show |
| Series | drm/plane: Remove drm_plane_init(), plus other cleanups | expand |
Reviewed-by: Lyude Paul <lyude@redhat.com> for common and nouveau bits On Fri, 2022-09-09 at 12:59 +0200, Thomas Zimmermann wrote: > Open-code drm_plane_init() and remove the function from DRM. The > implementation of drm_plane_init() is a simple wrapper around a call > to drm_universal_plane_init(), so drivers can just use that instead. > > Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> > --- > drivers/gpu/drm/drm_modeset_helper.c | 3 +- > drivers/gpu/drm/drm_plane.c | 32 ---------------------- > drivers/gpu/drm/nouveau/dispnv04/overlay.c | 13 +++++---- > drivers/gpu/drm/shmobile/shmob_drm_plane.c | 7 +++-- > drivers/gpu/drm/tilcdc/tilcdc_plane.c | 9 +++--- > include/drm/drm_plane.h | 8 +----- > 6 files changed, 17 insertions(+), 55 deletions(-) > > diff --git a/drivers/gpu/drm/drm_modeset_helper.c b/drivers/gpu/drm/drm_modeset_helper.c > index bd609a978848..611dd01fb604 100644 > --- a/drivers/gpu/drm/drm_modeset_helper.c > +++ b/drivers/gpu/drm/drm_modeset_helper.c > @@ -100,8 +100,7 @@ EXPORT_SYMBOL(drm_helper_mode_fill_fb_struct); > * This is the minimal list of formats that seem to be safe for modeset use > * with all current DRM drivers. Most hardware can actually support more > * formats than this and drivers may specify a more accurate list when > - * creating the primary plane. However drivers that still call > - * drm_plane_init() will use this minimal format list as the default. > + * creating the primary plane. > */ > static const uint32_t safe_modeset_formats[] = { > DRM_FORMAT_XRGB8888, > diff --git a/drivers/gpu/drm/drm_plane.c b/drivers/gpu/drm/drm_plane.c > index 726f2f163c26..0f14b4d3bb10 100644 > --- a/drivers/gpu/drm/drm_plane.c > +++ b/drivers/gpu/drm/drm_plane.c > @@ -482,38 +482,6 @@ void drm_plane_unregister_all(struct drm_device *dev) > } > } > > -/** > - * drm_plane_init - Initialize a legacy plane > - * @dev: DRM device > - * @plane: plane object to init > - * @possible_crtcs: bitmask of possible CRTCs > - * @funcs: callbacks for the new plane > - * @formats: array of supported formats (DRM_FORMAT\_\*) > - * @format_count: number of elements in @formats > - * @is_primary: plane type (primary vs overlay) > - * > - * Legacy API to initialize a DRM plane. > - * > - * New drivers should call drm_universal_plane_init() instead. > - * > - * Returns: > - * Zero on success, error code on failure. > - */ > -int drm_plane_init(struct drm_device *dev, struct drm_plane *plane, > - uint32_t possible_crtcs, > - const struct drm_plane_funcs *funcs, > - const uint32_t *formats, unsigned int format_count, > - bool is_primary) > -{ > - enum drm_plane_type type; > - > - type = is_primary ? DRM_PLANE_TYPE_PRIMARY : DRM_PLANE_TYPE_OVERLAY; > - return drm_universal_plane_init(dev, plane, possible_crtcs, funcs, > - formats, format_count, > - NULL, type, NULL); > -} > -EXPORT_SYMBOL(drm_plane_init); > - > /** > * drm_plane_cleanup - Clean up the core plane usage > * @plane: plane to cleanup > diff --git a/drivers/gpu/drm/nouveau/dispnv04/overlay.c b/drivers/gpu/drm/nouveau/dispnv04/overlay.c > index 37e63e98cd08..33f29736024a 100644 > --- a/drivers/gpu/drm/nouveau/dispnv04/overlay.c > +++ b/drivers/gpu/drm/nouveau/dispnv04/overlay.c > @@ -296,9 +296,10 @@ nv10_overlay_init(struct drm_device *device) > break; > } > > - ret = drm_plane_init(device, &plane->base, 3 /* both crtc's */, > - &nv10_plane_funcs, > - formats, num_formats, false); > + ret = drm_universal_plane_init(device, &plane->base, 3 /* both crtc's */, > + &nv10_plane_funcs, > + formats, num_formats, NULL, > + DRM_PLANE_TYPE_OVERLAY, NULL); > if (ret) > goto err; > > @@ -475,9 +476,9 @@ nv04_overlay_init(struct drm_device *device) > if (!plane) > return; > > - ret = drm_plane_init(device, &plane->base, 1 /* single crtc */, > - &nv04_plane_funcs, > - formats, 2, false); > + ret = drm_universal_plane_init(device, &plane->base, 1 /* single crtc */, > + &nv04_plane_funcs, formats, 2, NULL, > + DRM_PLANE_TYPE_OVERLAY, NULL); > if (ret) > goto err; > > diff --git a/drivers/gpu/drm/shmobile/shmob_drm_plane.c b/drivers/gpu/drm/shmobile/shmob_drm_plane.c > index 54228424793a..6c5f0cbe7d95 100644 > --- a/drivers/gpu/drm/shmobile/shmob_drm_plane.c > +++ b/drivers/gpu/drm/shmobile/shmob_drm_plane.c > @@ -252,9 +252,10 @@ int shmob_drm_plane_create(struct shmob_drm_device *sdev, unsigned int index) > splane->index = index; > splane->alpha = 255; > > - ret = drm_plane_init(sdev->ddev, &splane->plane, 1, > - &shmob_drm_plane_funcs, formats, > - ARRAY_SIZE(formats), false); > + ret = drm_universal_plane_init(sdev->ddev, &splane->plane, 1, > + &shmob_drm_plane_funcs, > + formats, ARRAY_SIZE(formats), NULL, > + DRM_PLANE_TYPE_OVERLAY, NULL); > > return ret; > } > diff --git a/drivers/gpu/drm/tilcdc/tilcdc_plane.c b/drivers/gpu/drm/tilcdc/tilcdc_plane.c > index 0ccf791301cb..cf77a8ce7398 100644 > --- a/drivers/gpu/drm/tilcdc/tilcdc_plane.c > +++ b/drivers/gpu/drm/tilcdc/tilcdc_plane.c > @@ -105,11 +105,10 @@ int tilcdc_plane_init(struct drm_device *dev, > struct tilcdc_drm_private *priv = dev->dev_private; > int ret; > > - ret = drm_plane_init(dev, plane, 1, > - &tilcdc_plane_funcs, > - priv->pixelformats, > - priv->num_pixelformats, > - true); > + ret = drm_universal_plane_init(dev, plane, 1, &tilcdc_plane_funcs, > + priv->pixelformats, > + priv->num_pixelformats, > + NULL, DRM_PLANE_TYPE_PRIMARY, NULL); > if (ret) { > dev_err(dev->dev, "Failed to initialize plane: %d\n", ret); > return ret; > diff --git a/include/drm/drm_plane.h b/include/drm/drm_plane.h > index 89ea54652e87..910cb941f3d5 100644 > --- a/include/drm/drm_plane.h > +++ b/include/drm/drm_plane.h > @@ -631,7 +631,7 @@ struct drm_plane { > unsigned int format_count; > /** > * @format_default: driver hasn't supplied supported formats for the > - * plane. Used by the drm_plane_init compatibility wrapper only. > + * plane. Used by the non-atomic driver compatibility wrapper only. > */ > bool format_default; > > @@ -762,12 +762,6 @@ int drm_universal_plane_init(struct drm_device *dev, > const uint64_t *format_modifiers, > enum drm_plane_type type, > const char *name, ...); > -int drm_plane_init(struct drm_device *dev, > - struct drm_plane *plane, > - uint32_t possible_crtcs, > - const struct drm_plane_funcs *funcs, > - const uint32_t *formats, unsigned int format_count, > - bool is_primary); > void drm_plane_cleanup(struct drm_plane *plane); > > __printf(10, 11)
Hello Thomas, On 9/9/22 12:59, Thomas Zimmermann wrote: > Open-code drm_plane_init() and remove the function from DRM. The > implementation of drm_plane_init() is a simple wrapper around a call > to drm_universal_plane_init(), so drivers can just use that instead. > > Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> > --- [...] > diff --git a/drivers/gpu/drm/nouveau/dispnv04/overlay.c b/drivers/gpu/drm/nouveau/dispnv04/overlay.c > index 37e63e98cd08..33f29736024a 100644 > --- a/drivers/gpu/drm/nouveau/dispnv04/overlay.c > +++ b/drivers/gpu/drm/nouveau/dispnv04/overlay.c > @@ -296,9 +296,10 @@ nv10_overlay_init(struct drm_device *device) > break; > } > > - ret = drm_plane_init(device, &plane->base, 3 /* both crtc's */, > - &nv10_plane_funcs, > - formats, num_formats, false); > + ret = drm_universal_plane_init(device, &plane->base, 3 /* both crtc's */, > + &nv10_plane_funcs, > + formats, num_formats, NULL, > + DRM_PLANE_TYPE_OVERLAY, NULL); Not only drm_plane_init() doesn't add much value but makes the code harder to read. Since by calling drm_universal_plane_init() instead, it's explicit whether the initialized plane is primary or an overlay. Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
Hi Thomas, Thank you for the patch. On Fri, Sep 09, 2022 at 12:59:44PM +0200, Thomas Zimmermann wrote: > Open-code drm_plane_init() and remove the function from DRM. The > implementation of drm_plane_init() is a simple wrapper around a call > to drm_universal_plane_init(), so drivers can just use that instead. > > Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > drivers/gpu/drm/drm_modeset_helper.c | 3 +- > drivers/gpu/drm/drm_plane.c | 32 ---------------------- > drivers/gpu/drm/nouveau/dispnv04/overlay.c | 13 +++++---- > drivers/gpu/drm/shmobile/shmob_drm_plane.c | 7 +++-- > drivers/gpu/drm/tilcdc/tilcdc_plane.c | 9 +++--- > include/drm/drm_plane.h | 8 +----- > 6 files changed, 17 insertions(+), 55 deletions(-) > > diff --git a/drivers/gpu/drm/drm_modeset_helper.c b/drivers/gpu/drm/drm_modeset_helper.c > index bd609a978848..611dd01fb604 100644 > --- a/drivers/gpu/drm/drm_modeset_helper.c > +++ b/drivers/gpu/drm/drm_modeset_helper.c > @@ -100,8 +100,7 @@ EXPORT_SYMBOL(drm_helper_mode_fill_fb_struct); > * This is the minimal list of formats that seem to be safe for modeset use > * with all current DRM drivers. Most hardware can actually support more > * formats than this and drivers may specify a more accurate list when > - * creating the primary plane. However drivers that still call > - * drm_plane_init() will use this minimal format list as the default. > + * creating the primary plane. > */ > static const uint32_t safe_modeset_formats[] = { > DRM_FORMAT_XRGB8888, > diff --git a/drivers/gpu/drm/drm_plane.c b/drivers/gpu/drm/drm_plane.c > index 726f2f163c26..0f14b4d3bb10 100644 > --- a/drivers/gpu/drm/drm_plane.c > +++ b/drivers/gpu/drm/drm_plane.c > @@ -482,38 +482,6 @@ void drm_plane_unregister_all(struct drm_device *dev) > } > } > > -/** > - * drm_plane_init - Initialize a legacy plane > - * @dev: DRM device > - * @plane: plane object to init > - * @possible_crtcs: bitmask of possible CRTCs > - * @funcs: callbacks for the new plane > - * @formats: array of supported formats (DRM_FORMAT\_\*) > - * @format_count: number of elements in @formats > - * @is_primary: plane type (primary vs overlay) > - * > - * Legacy API to initialize a DRM plane. > - * > - * New drivers should call drm_universal_plane_init() instead. > - * > - * Returns: > - * Zero on success, error code on failure. > - */ > -int drm_plane_init(struct drm_device *dev, struct drm_plane *plane, > - uint32_t possible_crtcs, > - const struct drm_plane_funcs *funcs, > - const uint32_t *formats, unsigned int format_count, > - bool is_primary) > -{ > - enum drm_plane_type type; > - > - type = is_primary ? DRM_PLANE_TYPE_PRIMARY : DRM_PLANE_TYPE_OVERLAY; > - return drm_universal_plane_init(dev, plane, possible_crtcs, funcs, > - formats, format_count, > - NULL, type, NULL); > -} > -EXPORT_SYMBOL(drm_plane_init); > - > /** > * drm_plane_cleanup - Clean up the core plane usage > * @plane: plane to cleanup > diff --git a/drivers/gpu/drm/nouveau/dispnv04/overlay.c b/drivers/gpu/drm/nouveau/dispnv04/overlay.c > index 37e63e98cd08..33f29736024a 100644 > --- a/drivers/gpu/drm/nouveau/dispnv04/overlay.c > +++ b/drivers/gpu/drm/nouveau/dispnv04/overlay.c > @@ -296,9 +296,10 @@ nv10_overlay_init(struct drm_device *device) > break; > } > > - ret = drm_plane_init(device, &plane->base, 3 /* both crtc's */, > - &nv10_plane_funcs, > - formats, num_formats, false); > + ret = drm_universal_plane_init(device, &plane->base, 3 /* both crtc's */, > + &nv10_plane_funcs, > + formats, num_formats, NULL, > + DRM_PLANE_TYPE_OVERLAY, NULL); > if (ret) > goto err; > > @@ -475,9 +476,9 @@ nv04_overlay_init(struct drm_device *device) > if (!plane) > return; > > - ret = drm_plane_init(device, &plane->base, 1 /* single crtc */, > - &nv04_plane_funcs, > - formats, 2, false); > + ret = drm_universal_plane_init(device, &plane->base, 1 /* single crtc */, > + &nv04_plane_funcs, formats, 2, NULL, > + DRM_PLANE_TYPE_OVERLAY, NULL); > if (ret) > goto err; > > diff --git a/drivers/gpu/drm/shmobile/shmob_drm_plane.c b/drivers/gpu/drm/shmobile/shmob_drm_plane.c > index 54228424793a..6c5f0cbe7d95 100644 > --- a/drivers/gpu/drm/shmobile/shmob_drm_plane.c > +++ b/drivers/gpu/drm/shmobile/shmob_drm_plane.c > @@ -252,9 +252,10 @@ int shmob_drm_plane_create(struct shmob_drm_device *sdev, unsigned int index) > splane->index = index; > splane->alpha = 255; > > - ret = drm_plane_init(sdev->ddev, &splane->plane, 1, > - &shmob_drm_plane_funcs, formats, > - ARRAY_SIZE(formats), false); > + ret = drm_universal_plane_init(sdev->ddev, &splane->plane, 1, > + &shmob_drm_plane_funcs, > + formats, ARRAY_SIZE(formats), NULL, > + DRM_PLANE_TYPE_OVERLAY, NULL); > > return ret; > } > diff --git a/drivers/gpu/drm/tilcdc/tilcdc_plane.c b/drivers/gpu/drm/tilcdc/tilcdc_plane.c > index 0ccf791301cb..cf77a8ce7398 100644 > --- a/drivers/gpu/drm/tilcdc/tilcdc_plane.c > +++ b/drivers/gpu/drm/tilcdc/tilcdc_plane.c > @@ -105,11 +105,10 @@ int tilcdc_plane_init(struct drm_device *dev, > struct tilcdc_drm_private *priv = dev->dev_private; > int ret; > > - ret = drm_plane_init(dev, plane, 1, > - &tilcdc_plane_funcs, > - priv->pixelformats, > - priv->num_pixelformats, > - true); > + ret = drm_universal_plane_init(dev, plane, 1, &tilcdc_plane_funcs, > + priv->pixelformats, > + priv->num_pixelformats, > + NULL, DRM_PLANE_TYPE_PRIMARY, NULL); > if (ret) { > dev_err(dev->dev, "Failed to initialize plane: %d\n", ret); > return ret; > diff --git a/include/drm/drm_plane.h b/include/drm/drm_plane.h > index 89ea54652e87..910cb941f3d5 100644 > --- a/include/drm/drm_plane.h > +++ b/include/drm/drm_plane.h > @@ -631,7 +631,7 @@ struct drm_plane { > unsigned int format_count; > /** > * @format_default: driver hasn't supplied supported formats for the > - * plane. Used by the drm_plane_init compatibility wrapper only. > + * plane. Used by the non-atomic driver compatibility wrapper only. > */ > bool format_default; > > @@ -762,12 +762,6 @@ int drm_universal_plane_init(struct drm_device *dev, > const uint64_t *format_modifiers, > enum drm_plane_type type, > const char *name, ...); > -int drm_plane_init(struct drm_device *dev, > - struct drm_plane *plane, > - uint32_t possible_crtcs, > - const struct drm_plane_funcs *funcs, > - const uint32_t *formats, unsigned int format_count, > - bool is_primary); > void drm_plane_cleanup(struct drm_plane *plane); > > __printf(10, 11)
diff --git a/drivers/gpu/drm/drm_modeset_helper.c b/drivers/gpu/drm/drm_modeset_helper.c index bd609a978848..611dd01fb604 100644 --- a/drivers/gpu/drm/drm_modeset_helper.c +++ b/drivers/gpu/drm/drm_modeset_helper.c @@ -100,8 +100,7 @@ EXPORT_SYMBOL(drm_helper_mode_fill_fb_struct); * This is the minimal list of formats that seem to be safe for modeset use * with all current DRM drivers. Most hardware can actually support more * formats than this and drivers may specify a more accurate list when - * creating the primary plane. However drivers that still call - * drm_plane_init() will use this minimal format list as the default. + * creating the primary plane. */ static const uint32_t safe_modeset_formats[] = { DRM_FORMAT_XRGB8888, diff --git a/drivers/gpu/drm/drm_plane.c b/drivers/gpu/drm/drm_plane.c index 726f2f163c26..0f14b4d3bb10 100644 --- a/drivers/gpu/drm/drm_plane.c +++ b/drivers/gpu/drm/drm_plane.c @@ -482,38 +482,6 @@ void drm_plane_unregister_all(struct drm_device *dev) } } -/** - * drm_plane_init - Initialize a legacy plane - * @dev: DRM device - * @plane: plane object to init - * @possible_crtcs: bitmask of possible CRTCs - * @funcs: callbacks for the new plane - * @formats: array of supported formats (DRM_FORMAT\_\*) - * @format_count: number of elements in @formats - * @is_primary: plane type (primary vs overlay) - * - * Legacy API to initialize a DRM plane. - * - * New drivers should call drm_universal_plane_init() instead. - * - * Returns: - * Zero on success, error code on failure. - */ -int drm_plane_init(struct drm_device *dev, struct drm_plane *plane, - uint32_t possible_crtcs, - const struct drm_plane_funcs *funcs, - const uint32_t *formats, unsigned int format_count, - bool is_primary) -{ - enum drm_plane_type type; - - type = is_primary ? DRM_PLANE_TYPE_PRIMARY : DRM_PLANE_TYPE_OVERLAY; - return drm_universal_plane_init(dev, plane, possible_crtcs, funcs, - formats, format_count, - NULL, type, NULL); -} -EXPORT_SYMBOL(drm_plane_init); - /** * drm_plane_cleanup - Clean up the core plane usage * @plane: plane to cleanup diff --git a/drivers/gpu/drm/nouveau/dispnv04/overlay.c b/drivers/gpu/drm/nouveau/dispnv04/overlay.c index 37e63e98cd08..33f29736024a 100644 --- a/drivers/gpu/drm/nouveau/dispnv04/overlay.c +++ b/drivers/gpu/drm/nouveau/dispnv04/overlay.c @@ -296,9 +296,10 @@ nv10_overlay_init(struct drm_device *device) break; } - ret = drm_plane_init(device, &plane->base, 3 /* both crtc's */, - &nv10_plane_funcs, - formats, num_formats, false); + ret = drm_universal_plane_init(device, &plane->base, 3 /* both crtc's */, + &nv10_plane_funcs, + formats, num_formats, NULL, + DRM_PLANE_TYPE_OVERLAY, NULL); if (ret) goto err; @@ -475,9 +476,9 @@ nv04_overlay_init(struct drm_device *device) if (!plane) return; - ret = drm_plane_init(device, &plane->base, 1 /* single crtc */, - &nv04_plane_funcs, - formats, 2, false); + ret = drm_universal_plane_init(device, &plane->base, 1 /* single crtc */, + &nv04_plane_funcs, formats, 2, NULL, + DRM_PLANE_TYPE_OVERLAY, NULL); if (ret) goto err; diff --git a/drivers/gpu/drm/shmobile/shmob_drm_plane.c b/drivers/gpu/drm/shmobile/shmob_drm_plane.c index 54228424793a..6c5f0cbe7d95 100644 --- a/drivers/gpu/drm/shmobile/shmob_drm_plane.c +++ b/drivers/gpu/drm/shmobile/shmob_drm_plane.c @@ -252,9 +252,10 @@ int shmob_drm_plane_create(struct shmob_drm_device *sdev, unsigned int index) splane->index = index; splane->alpha = 255; - ret = drm_plane_init(sdev->ddev, &splane->plane, 1, - &shmob_drm_plane_funcs, formats, - ARRAY_SIZE(formats), false); + ret = drm_universal_plane_init(sdev->ddev, &splane->plane, 1, + &shmob_drm_plane_funcs, + formats, ARRAY_SIZE(formats), NULL, + DRM_PLANE_TYPE_OVERLAY, NULL); return ret; } diff --git a/drivers/gpu/drm/tilcdc/tilcdc_plane.c b/drivers/gpu/drm/tilcdc/tilcdc_plane.c index 0ccf791301cb..cf77a8ce7398 100644 --- a/drivers/gpu/drm/tilcdc/tilcdc_plane.c +++ b/drivers/gpu/drm/tilcdc/tilcdc_plane.c @@ -105,11 +105,10 @@ int tilcdc_plane_init(struct drm_device *dev, struct tilcdc_drm_private *priv = dev->dev_private; int ret; - ret = drm_plane_init(dev, plane, 1, - &tilcdc_plane_funcs, - priv->pixelformats, - priv->num_pixelformats, - true); + ret = drm_universal_plane_init(dev, plane, 1, &tilcdc_plane_funcs, + priv->pixelformats, + priv->num_pixelformats, + NULL, DRM_PLANE_TYPE_PRIMARY, NULL); if (ret) { dev_err(dev->dev, "Failed to initialize plane: %d\n", ret); return ret; diff --git a/include/drm/drm_plane.h b/include/drm/drm_plane.h index 89ea54652e87..910cb941f3d5 100644 --- a/include/drm/drm_plane.h +++ b/include/drm/drm_plane.h @@ -631,7 +631,7 @@ struct drm_plane { unsigned int format_count; /** * @format_default: driver hasn't supplied supported formats for the - * plane. Used by the drm_plane_init compatibility wrapper only. + * plane. Used by the non-atomic driver compatibility wrapper only. */ bool format_default; @@ -762,12 +762,6 @@ int drm_universal_plane_init(struct drm_device *dev, const uint64_t *format_modifiers, enum drm_plane_type type, const char *name, ...); -int drm_plane_init(struct drm_device *dev, - struct drm_plane *plane, - uint32_t possible_crtcs, - const struct drm_plane_funcs *funcs, - const uint32_t *formats, unsigned int format_count, - bool is_primary); void drm_plane_cleanup(struct drm_plane *plane); __printf(10, 11)
Open-code drm_plane_init() and remove the function from DRM. The implementation of drm_plane_init() is a simple wrapper around a call to drm_universal_plane_init(), so drivers can just use that instead. Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> --- drivers/gpu/drm/drm_modeset_helper.c | 3 +- drivers/gpu/drm/drm_plane.c | 32 ---------------------- drivers/gpu/drm/nouveau/dispnv04/overlay.c | 13 +++++---- drivers/gpu/drm/shmobile/shmob_drm_plane.c | 7 +++-- drivers/gpu/drm/tilcdc/tilcdc_plane.c | 9 +++--- include/drm/drm_plane.h | 8 +----- 6 files changed, 17 insertions(+), 55 deletions(-)