diff mbox series

[v2,5/8] drm/client: Convert drm_client_buffer_addfb() to drm_mode_addfb2()

Message ID 50762fd1694d3b5f6df1bdfa482564adb2ee7f36.1692888745.git.geert@linux-m68k.org
State New
Headers
Series [v2,1/8] drm/dumb-buffers: Fix drm_mode_create_dumb() for bpp < 8 |

Commit Message

Geert Uytterhoeven Aug. 24, 2023, 3:08 p.m. UTC 
  Currently drm_client_buffer_addfb() uses the legacy drm_mode_addfb(),
which uses bpp and depth to guess the wanted buffer format.
However, drm_client_buffer_addfb() already knows the exact buffer
format, so there is no need to convert back and forth between buffer
format and bpp/depth, and the function can just call drm_mode_addfb2()
directly instead.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
Tested-by: Javier Martinez Canillas <javierm@redhat.com>
---
v2:
  - Add Reviewed-by, Tested-by,
  - s/drm_mode_create_dumb/drm_client_buffer_addfb/ in one-line summary.
---
 drivers/gpu/drm/drm_client.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

Comments

Geert Uytterhoeven Aug. 24, 2023, 3:22 p.m. UTC | #1 
Hi Daniel,

On Thu, Aug 24, 2023 at 5:12 PM Daniel Stone <daniel@fooishbar.org> wrote:
> On Thu, 24 Aug 2023 at 16:09, Geert Uytterhoeven <geert@linux-m68k.org> wrote:
> >         struct drm_client_dev *client = buffer->client;
> > -       struct drm_mode_fb_cmd fb_req = { };
> > -       const struct drm_format_info *info;
> > +       struct drm_mode_fb_cmd2 fb_req = { };
> >         int ret;
> >
> > -       info = drm_format_info(format);
> > -       fb_req.bpp = drm_format_info_bpp(info, 0);
> > -       fb_req.depth = info->depth;
> >         fb_req.width = width;
> >         fb_req.height = height;
> > -       fb_req.handle = handle;
> > -       fb_req.pitch = buffer->pitch;
> > +       fb_req.pixel_format = format;
> > +       fb_req.handles[0] = handle;
> > +       fb_req.pitches[0] = buffer->pitch;
> >
> > -       ret = drm_mode_addfb(client->dev, &fb_req, client->file);
> > +       ret = drm_mode_addfb2(client->dev, &fb_req, client->file);
> >         if (ret)
> >                 return ret;
>
> This should explicitly set the LINEAR modifier (and the modifier flag)
> if the driver supports modifiers.

Thanks for your comment!

I have no idea how to do that, and I do not know what the impact
would be.  All I know is that the current implementation of
drm_client_buffer_addfb() does not do that, so changing that in this
patch would mean that this would no longer be a trivial conversion.

Gr{oetje,eeting}s,

                        Geert
diff mbox series

Patch

diff --git a/drivers/gpu/drm/drm_client.c b/drivers/gpu/drm/drm_client.c
index 037e36f2049c1793..0ced189befebae12 100644
--- a/drivers/gpu/drm/drm_client.c
+++ b/drivers/gpu/drm/drm_client.c
@@ -395,19 +395,16 @@  static int drm_client_buffer_addfb(struct drm_client_buffer *buffer,
 				   u32 handle)
 {
 	struct drm_client_dev *client = buffer->client;
-	struct drm_mode_fb_cmd fb_req = { };
-	const struct drm_format_info *info;
+	struct drm_mode_fb_cmd2 fb_req = { };
 	int ret;
 
-	info = drm_format_info(format);
-	fb_req.bpp = drm_format_info_bpp(info, 0);
-	fb_req.depth = info->depth;
 	fb_req.width = width;
 	fb_req.height = height;
-	fb_req.handle = handle;
-	fb_req.pitch = buffer->pitch;
+	fb_req.pixel_format = format;
+	fb_req.handles[0] = handle;
+	fb_req.pitches[0] = buffer->pitch;
 
-	ret = drm_mode_addfb(client->dev, &fb_req, client->file);
+	ret = drm_mode_addfb2(client->dev, &fb_req, client->file);
 	if (ret)
 		return ret;