On Thu, Mar 05, 2015 at 11:01:08AM +0100, Daniel Vetter wrote:
> We shouldn't tempt driver writers into using this since it uses a
> default format list which is likely wrong. And when that's done we can
> simplify the code a bit, too.
>
> Noticed while reviewing a patch from Laurent.
>
> Cc: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
> Cc: Matt Roper <matthew.d.roper@xxxxxxxxx>
> Signed-off-by: Daniel Vetter <daniel.vetter@xxxxxxxxx>
Reviewed-by: Matt Roper <matthew.d.roper@xxxxxxxxx>
> ---
> drivers/gpu/drm/drm_plane_helper.c | 26 ++++----------------------
> include/drm/drm_plane_helper.h | 4 ----
> 2 files changed, 4 insertions(+), 26 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_plane_helper.c b/drivers/gpu/drm/drm_plane_helper.c
> index 5ba5792bfdba..de8c6565bc55 100644
> --- a/drivers/gpu/drm/drm_plane_helper.c
> +++ b/drivers/gpu/drm/drm_plane_helper.c
> @@ -344,20 +344,7 @@ const struct drm_plane_funcs drm_primary_helper_funcs = {
> };
> EXPORT_SYMBOL(drm_primary_helper_funcs);
>
> -/**
> - * drm_primary_helper_create_plane() - Create a generic primary plane
> - * @dev: drm device
> - * @formats: pixel formats supported, or NULL for a default safe list
> - * @num_formats: size of @formats; ignored if @formats is NULL
> - *
> - * Allocates and initializes a primary plane that can be used with the primary
> - * plane helpers. Drivers that wish to use driver-specific plane structures or
> - * provide custom handler functions may perform their own allocation and
> - * initialization rather than calling this function.
> - */
> -struct drm_plane *drm_primary_helper_create_plane(struct drm_device *dev,
> - const uint32_t *formats,
> - int num_formats)
> +static struct drm_plane *create_primary_plane(struct drm_device *dev)
> {
> struct drm_plane *primary;
> int ret;
> @@ -368,15 +355,11 @@ struct drm_plane *drm_primary_helper_create_plane(struct drm_device *dev,
> return NULL;
> }
>
> - if (formats == NULL) {
> - formats = safe_modeset_formats;
> - num_formats = ARRAY_SIZE(safe_modeset_formats);
> - }
> -
> /* possible_crtc's will be filled in later by crtc_init */
> ret = drm_universal_plane_init(dev, primary, 0,
> &drm_primary_helper_funcs,
> - formats, num_formats,
> + safe_modeset_formats,
> + ARRAY_SIZE(safe_modeset_formats),
> DRM_PLANE_TYPE_PRIMARY);
> if (ret) {
> kfree(primary);
> @@ -385,7 +368,6 @@ struct drm_plane *drm_primary_helper_create_plane(struct drm_device *dev,
>
> return primary;
> }
> -EXPORT_SYMBOL(drm_primary_helper_create_plane);
>
> /**
> * drm_crtc_init - Legacy CRTC initialization function
> @@ -404,7 +386,7 @@ int drm_crtc_init(struct drm_device *dev, struct drm_crtc *crtc,
> {
> struct drm_plane *primary;
>
> - primary = drm_primary_helper_create_plane(dev, NULL, 0);
> + primary = create_primary_plane(dev);
> return drm_crtc_init_with_planes(dev, crtc, primary, NULL, funcs);
> }
> EXPORT_SYMBOL(drm_crtc_init);
> diff --git a/include/drm/drm_plane_helper.h b/include/drm/drm_plane_helper.h
> index 31c11d36fae6..695f9791659d 100644
> --- a/include/drm/drm_plane_helper.h
> +++ b/include/drm/drm_plane_helper.h
> @@ -98,10 +98,6 @@ extern int drm_primary_helper_update(struct drm_plane *plane,
> extern int drm_primary_helper_disable(struct drm_plane *plane);
> extern void drm_primary_helper_destroy(struct drm_plane *plane);
> extern const struct drm_plane_funcs drm_primary_helper_funcs;
> -extern struct drm_plane *drm_primary_helper_create_plane(struct drm_device *dev,
> - const uint32_t *formats,
> - int num_formats);
> -
>
> int drm_plane_helper_update(struct drm_plane *plane, struct drm_crtc *crtc,
> struct drm_framebuffer *fb,
> --
> 2.1.4
>
--
Matt Roper
Graphics Software Engineer
IoTG Platform Enabling & Development
Intel Corporation
(916) 356-2795
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/dri-devel
