| 1 | Index: src/VBox/Additions/linux/drm/vbox_drv.c
|
|---|
| 2 | ===================================================================
|
|---|
| 3 | --- src/VBox/Additions/linux/drm/vbox_drv.c (revision 139690)
|
|---|
| 4 | +++ src/VBox/Additions/linux/drm/vbox_drv.c (working copy)
|
|---|
| 5 | @@ -326,7 +326,7 @@
|
|---|
| 6 | .master_drop = vbox_master_drop,
|
|---|
| 7 | #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0) || defined(RHEL_72)
|
|---|
| 8 | # if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0) && !defined(RHEL_75) \
|
|---|
| 9 | - && !defined(OPENSUSE_151)
|
|---|
| 10 | + && !defined(OPENSUSE_151) && !defined(OPENSUSE_125)
|
|---|
| 11 | .set_busid = drm_pci_set_busid,
|
|---|
| 12 | # endif
|
|---|
| 13 | #endif
|
|---|
| 14 | Index: src/VBox/Additions/linux/drm/vbox_drv.h
|
|---|
| 15 | ===================================================================
|
|---|
| 16 | --- src/VBox/Additions/linux/drm/vbox_drv.h (revision 139690)
|
|---|
| 17 | +++ src/VBox/Additions/linux/drm/vbox_drv.h (working copy)
|
|---|
| 18 | @@ -90,6 +90,9 @@
|
|---|
| 19 | # if CONFIG_SUSE_VERSION == 15 && CONFIG_SUSE_PATCHLEVEL == 1
|
|---|
| 20 | # define OPENSUSE_151
|
|---|
| 21 | # endif
|
|---|
| 22 | +# if CONFIG_SUSE_VERSION == 12 && CONFIG_SUSE_PATCHLEVEL >= 5
|
|---|
| 23 | +# define OPENSUSE_125
|
|---|
| 24 | +# endif
|
|---|
| 25 | #endif
|
|---|
| 26 |
|
|---|
| 27 | #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 14, 0) || defined(RHEL_71)
|
|---|
| 28 | Index: src/VBox/Additions/linux/drm/vbox_main.c
|
|---|
| 29 | ===================================================================
|
|---|
| 30 | --- src/VBox/Additions/linux/drm/vbox_main.c (revision 139690)
|
|---|
| 31 | +++ src/VBox/Additions/linux/drm/vbox_main.c (working copy)
|
|---|
| 32 | @@ -605,7 +605,8 @@
|
|---|
| 33 | }
|
|---|
| 34 | #endif
|
|---|
| 35 |
|
|---|
| 36 | -#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 0) && !defined(OPENSUSE_151) && !defined(RHEL_77) && !defined(RHEL_81)
|
|---|
| 37 | +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 0) && !defined(OPENSUSE_151) && !defined(OPENSUSE_125) \
|
|---|
| 38 | + && !defined(RHEL_77) && !defined(RHEL_81)
|
|---|
| 39 | static void ttm_bo_put(struct ttm_buffer_object *bo)
|
|---|
| 40 | {
|
|---|
| 41 | ttm_bo_unref(&bo);
|
|---|
| 42 | Index: src/VBox/Additions/linux/drm/vbox_mode.c
|
|---|
| 43 | ===================================================================
|
|---|
| 44 | --- src/VBox/Additions/linux/drm/vbox_mode.c (revision 139690)
|
|---|
| 45 | +++ src/VBox/Additions/linux/drm/vbox_mode.c (working copy)
|
|---|
| 46 | @@ -547,7 +547,8 @@
|
|---|
| 47 | for (i = 0; i < EDID_SIZE - 1; ++i)
|
|---|
| 48 | sum += edid[i];
|
|---|
| 49 | edid[EDID_SIZE - 1] = (0x100 - (sum & 0xFF)) & 0xFF;
|
|---|
| 50 | -#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 19, 0) || defined(OPENSUSE_151) || defined(RHEL_77) || defined(RHEL_81)
|
|---|
| 51 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 19, 0) || defined(OPENSUSE_151) || defined(OPENSUSE_125) \
|
|---|
| 52 | + || defined(RHEL_77) || defined(RHEL_81)
|
|---|
| 53 | drm_connector_update_edid_property(connector, (struct edid *)edid);
|
|---|
| 54 | #else
|
|---|
| 55 | drm_mode_connector_update_edid_property(connector, (struct edid *)edid);
|
|---|
| 56 | @@ -722,7 +723,8 @@
|
|---|
| 57 | drm_connector_register(connector);
|
|---|
| 58 | #endif
|
|---|
| 59 |
|
|---|
| 60 | -#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 19, 0) || defined(OPENSUSE_151) || defined(RHEL_77) || defined(RHEL_81)
|
|---|
| 61 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 19, 0) || defined(OPENSUSE_151) || defined(OPENSUSE_125) \
|
|---|
| 62 | + || defined(RHEL_77) || defined(RHEL_81)
|
|---|
| 63 | drm_connector_attach_encoder(connector, encoder);
|
|---|
| 64 | #else
|
|---|
| 65 | drm_mode_connector_attach_encoder(connector, encoder);
|
|---|
| 66 | Index: src/VBox/Additions/linux/drm/vbox_ttm.c
|
|---|
| 67 | ===================================================================
|
|---|
| 68 | --- src/VBox/Additions/linux/drm/vbox_ttm.c (revision 139690)
|
|---|
| 69 | +++ src/VBox/Additions/linux/drm/vbox_ttm.c (working copy)
|
|---|
| 70 | @@ -211,7 +211,7 @@
|
|---|
| 71 | };
|
|---|
| 72 |
|
|---|
| 73 | #if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 17, 0)) && !defined(RHEL_76) \
|
|---|
| 74 | - && !defined(OPENSUSE_151)
|
|---|
| 75 | + && !defined(OPENSUSE_151) && !defined(OPENSUSE_125)
|
|---|
| 76 | static struct ttm_tt *vbox_ttm_tt_create(struct ttm_bo_device *bdev,
|
|---|
| 77 | unsigned long size,
|
|---|
| 78 | u32 page_flags,
|
|---|
| 79 | @@ -229,7 +229,7 @@
|
|---|
| 80 |
|
|---|
| 81 | tt->func = &vbox_tt_backend_func;
|
|---|
| 82 | #if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 17, 0)) && !defined(RHEL_76) \
|
|---|
| 83 | - && !defined(OPENSUSE_151)
|
|---|
| 84 | + && !defined(OPENSUSE_151) && !defined(OPENSUSE_125)
|
|---|
| 85 | if (ttm_tt_init(tt, bdev, size, page_flags, dummy_read_page)) {
|
|---|
| 86 | #else
|
|---|
| 87 | if (ttm_tt_init(tt, bo, page_flags)) {
|
|---|
| 88 | @@ -243,7 +243,7 @@
|
|---|
| 89 |
|
|---|
| 90 | #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 17, 0)
|
|---|
| 91 | # if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)) && !defined(RHEL_76) \
|
|---|
| 92 | - && !defined(OPENSUSE_151)
|
|---|
| 93 | + && !defined(OPENSUSE_151) && !defined(OPENSUSE_125)
|
|---|
| 94 | static int vbox_ttm_tt_populate(struct ttm_tt *ttm)
|
|---|
| 95 | {
|
|---|
| 96 | return ttm_pool_populate(ttm);
|
|---|
| 97 | @@ -278,7 +278,7 @@
|
|---|
| 98 | .io_mem_free = &vbox_ttm_io_mem_free,
|
|---|
| 99 | #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) || defined(RHEL_75)
|
|---|
| 100 | # if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)) && !defined(RHEL_76) \
|
|---|
| 101 | - && !defined(OPENSUSE_151)
|
|---|
| 102 | + && !defined(OPENSUSE_151) && !defined(OPENSUSE_125)
|
|---|
| 103 | .io_mem_pfn = ttm_bo_default_io_mem_pfn,
|
|---|
| 104 | # endif
|
|---|
| 105 | #endif
|
|---|
| 106 | @@ -429,7 +429,7 @@
|
|---|
| 107 | ret = ttm_bo_init(&vbox->ttm.bdev, &vboxbo->bo, size,
|
|---|
| 108 | ttm_bo_type_device, &vboxbo->placement,
|
|---|
| 109 | #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 17, 0) && !defined(RHEL_76) \
|
|---|
| 110 | - && !defined(OPENSUSE_151)
|
|---|
| 111 | + && !defined(OPENSUSE_151) && !defined(OPENSUSE_125)
|
|---|
| 112 | align >> PAGE_SHIFT, false, NULL, acc_size,
|
|---|
| 113 | #else
|
|---|
| 114 | align >> PAGE_SHIFT, false, acc_size,
|
|---|
| 115 | @@ -459,7 +459,7 @@
|
|---|
| 116 | int vbox_bo_pin(struct vbox_bo *bo, u32 pl_flag, u64 *gpu_addr)
|
|---|
| 117 | {
|
|---|
| 118 | #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 16, 0)) || defined(RHEL_76) \
|
|---|
| 119 | - || defined(OPENSUSE_151)
|
|---|
| 120 | + || defined(OPENSUSE_151) || defined(OPENSUSE_125)
|
|---|
| 121 | struct ttm_operation_ctx ctx = { false, false };
|
|---|
| 122 | #endif
|
|---|
| 123 | int i, ret;
|
|---|
| 124 | @@ -478,7 +478,7 @@
|
|---|
| 125 | PLACEMENT_FLAGS(bo->placements[i]) |= TTM_PL_FLAG_NO_EVICT;
|
|---|
| 126 |
|
|---|
| 127 | #if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)) && !defined(RHEL_76) \
|
|---|
| 128 | - && !defined(OPENSUSE_151)
|
|---|
| 129 | + && !defined(OPENSUSE_151) && !defined(OPENSUSE_125)
|
|---|
| 130 | ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false);
|
|---|
| 131 | #else
|
|---|
| 132 | ret = ttm_bo_validate(&bo->bo, &bo->placement, &ctx);
|
|---|
| 133 | @@ -497,7 +497,7 @@
|
|---|
| 134 | int vbox_bo_unpin(struct vbox_bo *bo)
|
|---|
| 135 | {
|
|---|
| 136 | #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 16, 0)) || defined(RHEL_76) \
|
|---|
| 137 | - || defined(OPENSUSE_151)
|
|---|
| 138 | + || defined(OPENSUSE_151) || defined(OPENSUSE_125)
|
|---|
| 139 | struct ttm_operation_ctx ctx = { false, false };
|
|---|
| 140 | #endif
|
|---|
| 141 | int i, ret;
|
|---|
| 142 | @@ -514,7 +514,7 @@
|
|---|
| 143 | PLACEMENT_FLAGS(bo->placements[i]) &= ~TTM_PL_FLAG_NO_EVICT;
|
|---|
| 144 |
|
|---|
| 145 | #if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)) && !defined(RHEL_76) \
|
|---|
| 146 | - && !defined(OPENSUSE_151)
|
|---|
| 147 | + && !defined(OPENSUSE_151) && !defined(OPENSUSE_125)
|
|---|
| 148 | ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false);
|
|---|
| 149 | #else
|
|---|
| 150 | ret = ttm_bo_validate(&bo->bo, &bo->placement, &ctx);
|
|---|
| 151 | @@ -533,7 +533,7 @@
|
|---|
| 152 | int vbox_bo_push_sysram(struct vbox_bo *bo)
|
|---|
| 153 | {
|
|---|
| 154 | #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 16, 0)) || defined(RHEL_76) \
|
|---|
| 155 | - || defined(OPENSUSE_151)
|
|---|
| 156 | + || defined(OPENSUSE_151) || defined(OPENSUSE_125)
|
|---|
| 157 | struct ttm_operation_ctx ctx = { false, false };
|
|---|
| 158 | #endif
|
|---|
| 159 | int i, ret;
|
|---|
| 160 | @@ -555,7 +555,7 @@
|
|---|
| 161 | PLACEMENT_FLAGS(bo->placements[i]) |= TTM_PL_FLAG_NO_EVICT;
|
|---|
| 162 |
|
|---|
| 163 | #if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0)) && !defined(RHEL_76) \
|
|---|
| 164 | - && !defined(OPENSUSE_151)
|
|---|
| 165 | + && !defined(OPENSUSE_151) && !defined(OPENSUSE_125)
|
|---|
| 166 | ret = ttm_bo_validate(&bo->bo, &bo->placement, false, false);
|
|---|
| 167 | #else
|
|---|
| 168 | ret = ttm_bo_validate(&bo->bo, &bo->placement, &ctx);
|
|---|
| 169 | Index: src/VBox/Runtime/r0drv/linux/waitqueue-r0drv-linux.h
|
|---|
| 170 | ===================================================================
|
|---|
| 171 | --- src/VBox/Runtime/r0drv/linux/waitqueue-r0drv-linux.h (revision 139690)
|
|---|
| 172 | +++ src/VBox/Runtime/r0drv/linux/waitqueue-r0drv-linux.h (working copy)
|
|---|
| 173 | @@ -49,7 +49,7 @@
|
|---|
| 174 | {
|
|---|
| 175 | /** The wait queue entry. */
|
|---|
| 176 | #if LINUX_VERSION_CODE > KERNEL_VERSION(4, 13, 0) \
|
|---|
| 177 | - || defined(CONFIG_SUSE_VERSION) && CONFIG_SUSE_VERSION == 12 && CONFIG_SUSE_PATCHLEVEL == 4 \
|
|---|
| 178 | + || defined(CONFIG_SUSE_VERSION) && CONFIG_SUSE_VERSION == 12 && CONFIG_SUSE_PATCHLEVEL >= 4 \
|
|---|
| 179 | || defined(CONFIG_SUSE_VERSION) && CONFIG_SUSE_VERSION == 15
|
|---|
| 180 | wait_queue_entry_t WaitQE;
|
|---|
| 181 | #else
|
|---|