drm/omap: remove omap_framebuffer_get_formats()

We now get a fourcc array from dispc when asking for a plane's supported
pixel formats, so we can drop omap_framebuffer_get_formats() which was
used to convert between DSS and DRM pixel formats.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

1 files changed, 7 insertions, 8 deletions

diff --git a/drivers/gpu/drm/omapdrm/omap_plane.c b/drivers/gpu/drm/omapdrm/omap_plane.c
index 40747a625374..96c15e6d7397 100644
--- a/drivers/gpu/drm/omapdrm/omap_plane.c
+++ b/drivers/gpu/drm/omapdrm/omap_plane.c
@@ -34,9 +34,6 @@ struct omap_plane {
         struct drm_plane base;
         enum omap_plane_id id;
         const char *name;
-
-        uint32_t nformats;
-        uint32_t formats[32];
 };
 
 static int omap_plane_prepare_fb(struct drm_plane *plane,
@@ -294,6 +291,8 @@ struct drm_plane *omap_plane_init(struct drm_device *dev,
         struct omap_plane *omap_plane;
         enum omap_plane_id id;
         int ret;
+        u32 nformats;
+        const u32 *formats;
 
         if (WARN_ON(idx >= ARRAY_SIZE(plane_idx_to_id)))
                 return ERR_PTR(-EINVAL);
@@ -306,17 +305,17 @@ struct drm_plane *omap_plane_init(struct drm_device *dev,
         if (!omap_plane)
                 return ERR_PTR(-ENOMEM);
 
-        omap_plane->nformats = omap_framebuffer_get_formats(
-                        omap_plane->formats, ARRAY_SIZE(omap_plane->formats),
-                        priv->dispc_ops->ovl_get_color_modes(id));
+        formats = priv->dispc_ops->ovl_get_color_modes(id);
+        for (nformats = 0; formats[nformats]; ++nformats)
+                ;
         omap_plane->id = id;
         omap_plane->name = plane_id_to_name[id];
 
         plane = &omap_plane->base;
 
         ret = drm_universal_plane_init(dev, plane, possible_crtcs,
-                                       &omap_plane_funcs, omap_plane->formats,
-                                       omap_plane->nformats, type, NULL);
+                                       &omap_plane_funcs, formats,
+                                       nformats, type, NULL);
         if (ret < 0)
                 goto error;