diff options
| author | Ezequiel Garcia | 2018-09-25 18:16:05 +0200 |
|---|---|---|
| committer | Gerd Hoffmann | 2018-09-26 08:05:06 +0200 |
| commit | a20c4173c4219d85ba7775fde584cd34305a0b3d (patch) | |
| tree | ef61b4923f6927713a5aee08aea495a85c570144 /drivers/gpu/drm/virtio/virtgpu_fb.c | |
| parent | virtio: Add virtio_gpu_object_kunmap() (diff) | |
| download | kernel-qcow2-linux-a20c4173c4219d85ba7775fde584cd34305a0b3d.tar.gz kernel-qcow2-linux-a20c4173c4219d85ba7775fde584cd34305a0b3d.tar.xz kernel-qcow2-linux-a20c4173c4219d85ba7775fde584cd34305a0b3d.zip | |
virtio: Rework virtio_gpu_object_kmap()
Currently, virtio_gpu_object_kmap() is only called by
virtio_gpufb_create(), when a DRM framebuffer is created.
Thus, instead of returning the vmap'ed address, emit a warning
if virtio_gpu_object_kmap is called on an already mapped
object. With this change, kmap/kunmap calls are now balanced.
Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20180925161606.17980-3-ezequiel@collabora.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/virtio/virtgpu_fb.c')
| -rw-r--r-- | drivers/gpu/drm/virtio/virtgpu_fb.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/gpu/drm/virtio/virtgpu_fb.c b/drivers/gpu/drm/virtio/virtgpu_fb.c index e1e41efabec1..cea749f4ec39 100644 --- 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; } |