virtio: Rework virtio_gpu_object_kmap()

[sfrench/cifs-2.6.git] / drivers / gpu / drm / virtio / virtgpu_fb.c

diff --git a/drivers/gpu/drm/virtio/virtgpu_fb.c b/drivers/gpu/drm/virtio/virtgpu_fb.c
index e1e41efabec1d51c4b68b23b682d61d0c936c10d..cea749f4ec3930886f8c9f0dc14287bfccfd77c0 100644 (file)
--- a/drivers/gpu/drm/virtio/virtgpu_fb.c
+++ b/drivers/gpu/drm/virtio/virtgpu_fb.c
@@ -203,12 +203,6 @@ static struct fb_ops virtio_gpufb_ops = {
        .fb_imageblit = virtio_gpu_3d_imageblit,
 };
 
-static int virtio_gpu_vmap_fb(struct virtio_gpu_device *vgdev,
-                             struct virtio_gpu_object *obj)
-{
-       return virtio_gpu_object_kmap(obj, NULL);
-}
-
 static int virtio_gpufb_create(struct drm_fb_helper *helper,
                               struct drm_fb_helper_surface_size *sizes)
 {
@@ -241,9 +235,9 @@ static int virtio_gpufb_create(struct drm_fb_helper *helper,
        virtio_gpu_cmd_create_resource(vgdev, resid, format,
                                       mode_cmd.width, mode_cmd.height);
 
-       ret = virtio_gpu_vmap_fb(vgdev, obj);
+       ret = virtio_gpu_object_kmap(obj);
        if (ret) {
-               DRM_ERROR("failed to vmap fb %d\n", ret);
+               DRM_ERROR("failed to kmap fb %d\n", ret);
                goto err_obj_vmap;
        }