Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 541050 | Differences between
and this patch

Collapse All | Expand All

(-)src/VBox/Additions/linux/drm/vboxvideo_drm.c.orig (-1 / +21 lines)
Lines 77-82 Link Here
77
# endif
77
# endif
78
78
79
#include "drm/drmP.h"
79
#include "drm/drmP.h"
80
# if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0)
81
#   include "drm/drm_legacy.h"
82
# endif
80
#include "vboxvideo_drm.h"
83
#include "vboxvideo_drm.h"
81
84
82
# ifndef RHEL_RELEASE_CODE
85
# ifndef RHEL_RELEASE_CODE
Lines 126-132 Link Here
126
        .open = drm_open,
129
        .open = drm_open,
127
        .release = drm_release,
130
        .release = drm_release,
128
        .unlocked_ioctl = drm_ioctl,
131
        .unlocked_ioctl = drm_ioctl,
129
        .mmap = drm_mmap,
132
# if LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0)
133
	 /* This shouldn't be necessary even for old kernels as there is
134
	 * nothing sensible to mmap. But we play safe and keep it for
135
	 * legacy reasons. */
136
	.mmap = drm_mmap,
137
# else
138
	.mmap = drm_legacy_mmap,
139
# endif
130
        .poll = drm_poll,
140
        .poll = drm_poll,
131
};
141
};
132
#endif
142
#endif
Lines 143-148 Link Here
143
    .get_map_ofs = drm_core_get_map_ofs,
153
    .get_map_ofs = drm_core_get_map_ofs,
144
    .get_reg_ofs = drm_core_get_reg_ofs,
154
    .get_reg_ofs = drm_core_get_reg_ofs,
145
#endif
155
#endif
156
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0)
157
    /* If this is missing a warning gets printed to dmesg.  We will not
158
     * attempt to make kernels work to which the change (915b4d11b) got back-
159
     * ported, as the problem is only cosmetic. */
160
    .set_busid = drm_pci_set_busid,
161
#endif
146
# if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0) && !defined(DRM_FOPS_AS_POINTER)
162
# if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0) && !defined(DRM_FOPS_AS_POINTER)
147
    .fops =
163
    .fops =
148
    {
164
    {
Lines 156-162 Link Here
156
#else
172
#else
157
        .ioctl = drm_ioctl,
173
        .ioctl = drm_ioctl,
158
#endif
174
#endif
175
# if LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0)
159
        .mmap = drm_mmap,
176
        .mmap = drm_mmap,
177
# else
178
		.mmap = drm_legacy_mmap,
179
# endif
160
        .poll = drm_poll,
180
        .poll = drm_poll,
161
    },
181
    },
162
#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(3, 3, 0) || defined(DRM_FOPS_AS_POINTER) */
182
#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(3, 3, 0) || defined(DRM_FOPS_AS_POINTER) */

Return to bug 541050