Changeset 42784 in vbox for trunk/src/VBox/Additions/linux
- Timestamp:
- Aug 12, 2012 8:31:36 PM (12 years ago)
- Location:
- trunk/src/VBox/Additions/linux/drm
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Additions/linux/drm/vboxvideo_crtc.c
r39335 r42784 44 44 45 45 #include <linux/version.h> 46 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6,33)46 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 33) 47 47 48 48 #include <VBox/VBoxVideoGuest.h> -
trunk/src/VBox/Additions/linux/drm/vboxvideo_dac.c
r39335 r42784 44 44 45 45 #include <linux/version.h> 46 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6,33)46 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 33) 47 47 48 48 #include "vboxvideo_drv.h" -
trunk/src/VBox/Additions/linux/drm/vboxvideo_drm.c
r42164 r42784 51 51 52 52 #include <linux/version.h> 53 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6,33)53 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 33) 54 54 # include <generated/autoconf.h> 55 55 #else … … 83 83 int vboxvideo_driver_load(struct drm_device * dev, unsigned long flags) 84 84 { 85 # if LINUX_VERSION_CODE >= KERNEL_VERSION 85 # if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28) 86 86 return drm_vblank_init(dev, 1); 87 87 #else … … 89 89 #endif 90 90 } 91 #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 3,0) || defined(DRM_RHEL63)91 #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 3, 0) || defined(DRM_RHEL63) 92 92 /* since linux-3.3.0-rc1 drm_driver::fops is pointer */ 93 93 static struct file_operations driver_fops = … … 107 107 /* .driver_features = DRIVER_USE_MTRR, */ 108 108 .load = vboxvideo_driver_load, 109 #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 6, 0) 109 110 .reclaim_buffers = drm_core_reclaim_buffers, 111 #endif 110 112 /* As of Linux 2.6.37, always the internal functions are used. */ 111 #if LINUX_VERSION_CODE < KERNEL_VERSION 113 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 37) && !defined(DRM_RHEL61) 112 114 .get_map_ofs = drm_core_get_map_ofs, 113 115 .get_reg_ofs = drm_core_get_reg_ofs, 114 116 #endif 115 # if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3,0) && !defined(DRM_RHEL63)117 # if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0) && !defined(DRM_RHEL63) 116 118 .fops = 117 119 { … … 121 123 /* This was changed with Linux 2.6.33 but Fedora backported this 122 124 * change to their 2.6.32 kernel. */ 123 #if defined(DRM_UNLOCKED) || LINUX_VERSION_CODE >= KERNEL_VERSION 125 #if defined(DRM_UNLOCKED) || LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 33) 124 126 .unlocked_ioctl = drm_ioctl, 125 127 #else … … 130 132 .fasync = drm_fasync, 131 133 }, 132 #else /* LINUX_VERSION_CODE >= KERNEL_VERSION(3, 3,0) || defined(DRM_RHEL63) */134 #else /* LINUX_VERSION_CODE >= KERNEL_VERSION(3, 3, 0) || defined(DRM_RHEL63) */ 133 135 .fops = &driver_fops, 134 136 #endif 135 #if LINUX_VERSION_CODE < KERNEL_VERSION 137 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39) && !defined(DRM_RHEL61) 136 138 .pci_driver = 137 139 { … … 148 150 }; 149 151 150 #if LINUX_VERSION_CODE >= KERNEL_VERSION 152 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39) || defined(DRM_RHEL61) 151 153 static struct pci_driver pci_driver = 152 154 { … … 158 160 static int __init vboxvideo_init(void) 159 161 { 160 #if LINUX_VERSION_CODE < KERNEL_VERSION 162 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39) && !defined(DRM_RHEL61) 161 163 return drm_init(&driver); 162 164 #else … … 167 169 static void __exit vboxvideo_exit(void) 168 170 { 169 #if LINUX_VERSION_CODE < KERNEL_VERSION 171 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39) && !defined(DRM_RHEL61) 170 172 drm_exit(&driver); 171 173 #else -
trunk/src/VBox/Additions/linux/drm/vboxvideo_vga.c
r39335 r42784 44 44 45 45 #include <linux/version.h> 46 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6,33)46 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 33) 47 47 48 48 #include "vboxvideo_drv.h"
Note:
See TracChangeset
for help on using the changeset viewer.