Changeset 86542 in vbox for trunk/src/VBox/Additions/linux/drm

Timestamp:

Oct 12, 2020 1:35:53 PM (4 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

140857

Message:

Additions/linux, Runtime/r0drv/linux: Adjustments for Linux 5.9.

Location:

trunk/src/VBox/Additions/linux/drm

Files:

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

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

@@ -263 +263 @@
 };
 
-static int vbox_master_set(struct drm_device *dev,
+#if RTLNX_VER_MIN(5,9,0)
+static void
+#else
+static int
+#endif
+            vbox_master_set(struct drm_device *dev,
                            struct drm_file *file_priv, bool from_open)
 {
@@ -282 +287 @@
         mutex_unlock(&vbox->hw_mutex);
 
+#if RTLNX_VER_MAX(5,9,0)
         return 0;
+#endif
 }
 

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

@@ -406 +406 @@
                         vbox_bo_unreserve(bo);
                 }
+#if RTLNX_VER_MIN(5,9,0)
+                drm_gem_object_put(afb->obj);
+#else
                 drm_gem_object_put_unlocked(afb->obj);
+#endif
                 afb->obj = NULL;
         }

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

@@ -47 +47 @@
 
         if (vbox_fb->obj)
+#if RTLNX_VER_MIN(5,9,0)
+                drm_gem_object_put(vbox_fb->obj);
+#else
                 drm_gem_object_put_unlocked(vbox_fb->obj);
+#endif
 
         drm_framebuffer_cleanup(fb);
@@ -222 +226 @@
         kfree(vbox_fb);
 err_unref_obj:
+#if RTLNX_VER_MIN(5,9,0)
+        drm_gem_object_put(obj);
+#else
         drm_gem_object_put_unlocked(obj);
+#endif
         return ERR_PTR(ret);
 }
@@ -589 +597 @@
 
         ret = drm_gem_handle_create(file, gobj, &handle);
+#if RTLNX_VER_MIN(5,9,0)
+        drm_gem_object_put(gobj);
+#else
         drm_gem_object_put_unlocked(gobj);
+#endif
         if (ret)
                 return ret;

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

@@ -885 +885 @@
         vbox_bo_unreserve(bo);
 out_unref_obj:
+#if RTLNX_VER_MIN(5,9,0)
+        drm_gem_object_put(obj);
+#else
         drm_gem_object_put_unlocked(obj);
+#endif
 
         return ret;

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

@@ -446 +446 @@
 static inline u64 vbox_bo_gpu_offset(struct vbox_bo *bo)
 {
+#if RTLNX_VER_MIN(5,9,0)
+        return bo->bo.mem.start << PAGE_SHIFT;
+#else
         return bo->bo.offset;
+#endif
 }