Merge tag 'drm-next-2020-06-02' of git://anongit.freedesktop.org/drm/drm

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

diff --git a/drivers/gpu/drm/virtio/virtgpu_gem.c b/drivers/gpu/drm/virtio/virtgpu_gem.c
index f0d5a89..d6cb350 100644 (file)
--- a/drivers/gpu/drm/virtio/virtgpu_gem.c
+++ b/drivers/gpu/drm/virtio/virtgpu_gem.c
@@ -28,11 +28,11 @@
 
 #include "virtgpu_drv.h"
 
-int virtio_gpu_gem_create(struct drm_file *file,
-                         struct drm_device *dev,
-                         struct virtio_gpu_object_params *params,
-                         struct drm_gem_object **obj_p,
-                         uint32_t *handle_p)
+static int virtio_gpu_gem_create(struct drm_file *file,
+                                struct drm_device *dev,
+                                struct virtio_gpu_object_params *params,
+                                struct drm_gem_object **obj_p,
+                                uint32_t *handle_p)
 {
        struct virtio_gpu_device *vgdev = dev->dev_private;
        struct virtio_gpu_object *obj;
@@ -117,7 +117,7 @@ int virtio_gpu_gem_object_open(struct drm_gem_object *obj,
        struct virtio_gpu_object_array *objs;
 
        if (!vgdev->has_virgl_3d)
-               return 0;
+               goto out_notify;
 
        objs = virtio_gpu_array_alloc(1);
        if (!objs)
@@ -126,6 +126,7 @@ int virtio_gpu_gem_object_open(struct drm_gem_object *obj,
 
        virtio_gpu_cmd_context_attach_resource(vgdev, vfpriv->ctx_id,
                                               objs);
+out_notify:
        virtio_gpu_notify(vgdev);
        return 0;
 }