Changeset 74882 in vbox

Timestamp:

Oct 17, 2018 2:47:16 PM (6 years ago)

Author:

vboxsync

Message:

Additions/linux/vboxvideo: switch to drm_*_get(), drm_*_put() helpers
bugref:8282: Additions/linux: track kernel changes to vboxvideo in our own tree

Use drm_*_get() and drm_*_put() helpers instead of drm_*_reference()
and drm_*_unreference() helpers.

drm_*_reference() and drm_*_unreference() functions are just
compatibility alias for drm_*_get() and drm_*_put() and should not be
used by new code. So convert all users of compatibility functions to
use the new APIs.

Generated by: scripts/coccinelle/api/drm-get-put.cocci

Signed-off-by: Cihangir Akturk <cakturk@…>
Reviewed-by: Hans de Goede <hdegoede@…>
Signed-off-by: Sean Paul <seanpaul@…>
Link: ​https://patchwork.freedesktop.org/patch/msgid/1502454794-28558-29-git-

send-email-cakturk@…
Adjusted by the VirtualBox team.

Location:

trunk/src/VBox/Additions/linux/drm

Files:

• vbox_drv.h (modified) (1 diff)
• vbox_fb.c (modified) (1 diff)
• vbox_main.c (modified) (3 diffs)
• vbox_mode.c (modified) (1 diff)

trunk/src/VBox/Additions/linux/drm/vbox_drv.h

@@ -103 +103 @@
 #include "product-generated.h"
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0) && !defined(RHEL_75)
+static inline void drm_gem_object_put_unlocked(struct drm_gem_object *obj)
+{
+        drm_gem_object_unreference_unlocked(obj);
+}
+#endif
+
 #define DRIVER_AUTHOR       VBOX_VENDOR
 

trunk/src/VBox/Additions/linux/drm/vbox_fb.c

@@ -394 +394 @@
                         vbox_bo_unreserve(bo);
                 }
-                drm_gem_object_unreference_unlocked(afb->obj);
+                drm_gem_object_put_unlocked(afb->obj);
                 afb->obj = NULL;
         }

trunk/src/VBox/Additions/linux/drm/vbox_main.c

@@ -47 +47 @@
 
         if (vbox_fb->obj)
-                drm_gem_object_unreference_unlocked(vbox_fb->obj);
+                drm_gem_object_put_unlocked(vbox_fb->obj);
 
         drm_framebuffer_cleanup(fb);
@@ -221 +221 @@
         kfree(vbox_fb);
 err_unref_obj:
-        drm_gem_object_unreference_unlocked(obj);
+        drm_gem_object_put_unlocked(obj);
         return ERR_PTR(ret);
 }
@@ -584 +584 @@
 
         ret = drm_gem_handle_create(file, gobj, &handle);
-        drm_gem_object_unreference_unlocked(gobj);
+        drm_gem_object_put_unlocked(gobj);
         if (ret)
                 return ret;

trunk/src/VBox/Additions/linux/drm/vbox_mode.c

@@ -828 +828 @@
         vbox_bo_unreserve(bo);
 out_unref_obj:
-        drm_gem_object_unreference_unlocked(obj);
+        drm_gem_object_put_unlocked(obj);
 
         return ret;