Merge tag 'printk-for-6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/printk...

[linux-2.6-microblaze.git] / drivers / gpu / drm / drm_client.c

diff --git a/drivers/gpu/drm/drm_client.c b/drivers/gpu/drm/drm_client.c
index 037e36f..c302711 100644 (file)
--- 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;
 
@@ -535,9 +532,9 @@ static const struct drm_debugfs_info drm_client_debugfs_list[] = {
        { "internal_clients", drm_client_debugfs_internal_clients, 0 },
 };
 
-void drm_client_debugfs_init(struct drm_minor *minor)
+void drm_client_debugfs_init(struct drm_device *dev)
 {
-       drm_debugfs_add_files(minor->dev, drm_client_debugfs_list,
+       drm_debugfs_add_files(dev, drm_client_debugfs_list,
                              ARRAY_SIZE(drm_client_debugfs_list));
 }
 #endif