]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
drm/vboxvideo: Use drm_fb_helper_fill_info
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 26 Mar 2019 13:20:07 +0000 (14:20 +0100)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 27 Mar 2019 09:07:21 +0000 (10:07 +0100)
This should not result in any changes.

v2: Rebase over vbox changes - vbox gained it's own line to fill
fix.id.

v3: Rebase

Reviewed-by: Noralf Trønnes <noralf@tronnes.org>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> (v2)
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Hans de Goede <hdegoede@redhat.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Alexander Kapshuk <alexander.kapshuk@gmail.com>
Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190326132008.11781-20-daniel.vetter@ffwll.ch
drivers/gpu/drm/vboxvideo/vbox_fb.c

index 83a04afd17669f4809038a19fb3a9a40da992fd5..b724fe7c0c30ae4cfc979d493bc7c943f70a53b5 100644 (file)
@@ -90,13 +90,9 @@ int vboxfb_create(struct drm_fb_helper *helper,
        if (IS_ERR(info->screen_base))
                return PTR_ERR(info->screen_base);
 
-       info->par = helper;
-
        fb = &vbox->afb.base;
        helper->fb = fb;
 
-       strcpy(info->fix.id, "vboxdrmfb");
-
        info->fbops = &vboxfb_ops;
 
        /*
@@ -106,9 +102,7 @@ int vboxfb_create(struct drm_fb_helper *helper,
        info->apertures->ranges[0].base = pci_resource_start(pdev, 0);
        info->apertures->ranges[0].size = pci_resource_len(pdev, 0);
 
-       drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth);
-       drm_fb_helper_fill_var(info, helper, sizes->fb_width,
-                              sizes->fb_height);
+       drm_fb_helper_fill_info(info, helper, sizes);
 
        gpu_addr = vbox_bo_gpu_offset(bo);
        info->fix.smem_start = info->apertures->ranges[0].base + gpu_addr;