]> git.itanic.dy.fi Git - linux-stable/commitdiff
drm/client: Convert drm_client_buffer_addfb() to drm_mode_addfb2()
authorGeert Uytterhoeven <geert@linux-m68k.org>
Sun, 15 Oct 2023 14:27:04 +0000 (16:27 +0200)
committerHamza Mahfooz <hamza.mahfooz@amd.com>
Tue, 24 Oct 2023 16:21:01 +0000 (12:21 -0400)
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>
Signed-off-by: Hamza Mahfooz <hamza.mahfooz@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/4b84adfc686288714e69d0442d22f1259ff74903.1697379891.git.geert@linux-m68k.org
drivers/gpu/drm/drm_client.c

index 2762572f286e7b2e89b2252c7b28c39ad3806a05..c3027115d05527e30b04a8ca83fed1553004166b 100644 (file)
@@ -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;