diff -uNr VirtualBox-kmod-6.1.18.orig/vboxvideo/vbox_drv.c VirtualBox-kmod-6.1.18/vboxvideo/vbox_drv.c
|
old
|
new
|
|
| 257 | 257 | .read = drm_read, |
| 258 | 258 | }; |
| 259 | 259 | |
| 260 | | #if RTLNX_VER_MIN(5,9,0) |
| | 260 | #if RTLNX_VER_MIN(5,9,0) || RTLNX_RHEL_MIN(8,4) |
| 261 | 261 | static void |
| 262 | 262 | #else |
| 263 | 263 | static int |
diff -uNr VirtualBox-kmod-6.1.18.orig/vboxvideo/vbox_fb.c VirtualBox-kmod-6.1.18/vboxvideo/vbox_fb.c
|
old
|
new
|
|
| 400 | 400 | vbox_bo_unpin(bo); |
| 401 | 401 | vbox_bo_unreserve(bo); |
| 402 | 402 | } |
| 403 | | #if RTLNX_VER_MIN(5,9,0) |
| | 403 | #if RTLNX_VER_MIN(5,9,0) || RTLNX_RHEL_MIN(8,4) |
| 404 | 404 | drm_gem_object_put(afb->obj); |
| 405 | 405 | #else |
| 406 | 406 | drm_gem_object_put_unlocked(afb->obj); |
| … |
… |
|
| 433 | 433 | #else |
| 434 | 434 | drm_fb_helper_prepare(dev, &fbdev->helper, &vbox_fb_helper_funcs); |
| 435 | 435 | #endif |
| 436 | | #if RTLNX_VER_MIN(5,7,0) |
| | 436 | #if RTLNX_VER_MIN(5,7,0) || RTLNX_RHEL_MIN(8,4) |
| 437 | 437 | ret = drm_fb_helper_init(dev, &fbdev->helper); |
| 438 | 438 | #elif RTLNX_VER_MIN(4,11,0) || RTLNX_RHEL_MAJ_PREREQ(7,5) |
| 439 | 439 | ret = drm_fb_helper_init(dev, &fbdev->helper, vbox->num_crtcs); |
| … |
… |
|
| 445 | 445 | if (ret) |
| 446 | 446 | return ret; |
| 447 | 447 | |
| 448 | | #if RTLNX_VER_MAX(5,7,0) |
| | 448 | #if RTLNX_VER_MAX(5,7,0) && RTLNX_RHEL_MAX(8,3) |
| 449 | 449 | ret = drm_fb_helper_single_add_all_connectors(&fbdev->helper); |
| 450 | 450 | if (ret) |
| 451 | 451 | goto err_fini; |
diff -uNr VirtualBox-kmod-6.1.18.orig/vboxvideo/vbox_main.c VirtualBox-kmod-6.1.18/vboxvideo/vbox_main.c
|
old
|
new
|
|
| 41 | 41 | struct vbox_framebuffer *vbox_fb = to_vbox_framebuffer(fb); |
| 42 | 42 | |
| 43 | 43 | if (vbox_fb->obj) |
| 44 | | #if RTLNX_VER_MIN(5,9,0) |
| | 44 | #if RTLNX_VER_MIN(5,9,0) || RTLNX_RHEL_MIN(8,4) |
| 45 | 45 | drm_gem_object_put(vbox_fb->obj); |
| 46 | 46 | #else |
| 47 | 47 | drm_gem_object_put_unlocked(vbox_fb->obj); |
| … |
… |
|
| 220 | 220 | err_free_vbox_fb: |
| 221 | 221 | kfree(vbox_fb); |
| 222 | 222 | err_unref_obj: |
| 223 | | #if RTLNX_VER_MIN(5,9,0) |
| | 223 | #if RTLNX_VER_MIN(5,9,0) || RTLNX_RHEL_MIN(8,4) |
| 224 | 224 | drm_gem_object_put(obj); |
| 225 | 225 | #else |
| 226 | 226 | drm_gem_object_put_unlocked(obj); |
| … |
… |
|
| 591 | 591 | return ret; |
| 592 | 592 | |
| 593 | 593 | ret = drm_gem_handle_create(file, gobj, &handle); |
| 594 | | #if RTLNX_VER_MIN(5,9,0) |
| | 594 | #if RTLNX_VER_MIN(5,9,0) || RTLNX_RHEL_MIN(8,4) |
| 595 | 595 | drm_gem_object_put(gobj); |
| 596 | 596 | #else |
| 597 | 597 | drm_gem_object_put_unlocked(gobj); |
diff -uNr VirtualBox-kmod-6.1.18.orig/vboxvideo/vbox_mode.c VirtualBox-kmod-6.1.18/vboxvideo/vbox_mode.c
|
old
|
new
|
|
| 879 | 879 | out_unreserve_bo: |
| 880 | 880 | vbox_bo_unreserve(bo); |
| 881 | 881 | out_unref_obj: |
| 882 | | #if RTLNX_VER_MIN(5,9,0) |
| | 882 | #if RTLNX_VER_MIN(5,9,0) || RTLNX_RHEL_MIN(8,4) |
| 883 | 883 | drm_gem_object_put(obj); |
| 884 | 884 | #else |
| 885 | 885 | drm_gem_object_put_unlocked(obj); |
diff -uNr VirtualBox-kmod-6.1.18.orig/vboxvideo/vbox_ttm.c VirtualBox-kmod-6.1.18/vboxvideo/vbox_ttm.c
|
old
|
new
|
|
| 519 | 519 | |
| 520 | 520 | static inline u64 vbox_bo_gpu_offset(struct vbox_bo *bo) |
| 521 | 521 | { |
| 522 | | #if RTLNX_VER_MIN(5,9,0) |
| | 522 | #if RTLNX_VER_MIN(5,9,0) || RTLNX_RHEL_MIN(8,4) |
| 523 | 523 | return bo->bo.mem.start << PAGE_SHIFT; |
| 524 | 524 | #else |
| 525 | 525 | return bo->bo.offset; |