diff options
| author | Sibren Vasse | 2018-06-17 03:22:43 +0200 |
|---|---|---|
| committer | Sibren Vasse | 2018-06-17 03:23:53 +0200 |
| commit | aa367534225c54c609620a205744e3807510b96d (patch) | |
| tree | 332ad0b6a9979e73d2513b927a0dcc57045d7986 | |
| parent | 6a8418dd8b93c7d5001afbf0831da188f77ee279 (diff) | |
| download | aur-aa367534225c54c609620a205744e3807510b96d.tar.gz | |
Fix compilation with linux 4.18-rc1
| -rw-r--r-- | .SRCINFO | 3 | ||||
| -rw-r--r-- | PKGBUILD | 6 | ||||
| -rw-r--r-- | drm-control-allow.patch | 48 |
3 files changed, 54 insertions, 3 deletions
@@ -1,7 +1,7 @@ pkgbase = nvidia-beta-dkms pkgdesc = NVIDIA kernel module sources (DKMS) - BETA version pkgver = 396.24 - pkgrel = 1 + pkgrel = 2 url = http://www.nvidia.com/ install = nvidia-beta-dkms.install arch = x86_64 @@ -17,6 +17,7 @@ pkgbase = nvidia-beta-dkms conflicts = nvidia options = !strip source = http://us.download.nvidia.com/XFree86/Linux-x86_64/396.24/NVIDIA-Linux-x86_64-396.24-no-compat32.run + source = drm-control-allow.patch sha256sums = 41b80d2a4519ac78ac17c02fec976256d2ba5c9618640d2a9be9cb70685b2a9c pkgname = nvidia-beta-dkms @@ -9,7 +9,7 @@ pkgname=nvidia-beta-dkms pkgver=396.24 -pkgrel=1 +pkgrel=2 pkgdesc="NVIDIA kernel module sources (DKMS) - BETA version" arch=('x86_64') url="http://www.nvidia.com/" @@ -22,7 +22,8 @@ conflicts=('nvidia') options=('!strip') install=${pkgname}.install _pkg="NVIDIA-Linux-x86_64-$pkgver-no-compat32" -source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run") +source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run" +drm-control-allow.patch) sha256sums=('41b80d2a4519ac78ac17c02fec976256d2ba5c9618640d2a9be9cb70685b2a9c') prepare() { @@ -35,6 +36,7 @@ prepare() { sh ${_pkg}.run --extract-only cd ${_pkg}/kernel # patches here + patch -p2 -i "${srcdir}/drm-control-allow.patch" # Update dkms.conf sed -e "s/__VERSION_STRING/${pkgver}/" \ diff --git a/drm-control-allow.patch b/drm-control-allow.patch new file mode 100644 index 000000000000..08a82afa96ec --- /dev/null +++ b/drm-control-allow.patch @@ -0,0 +1,48 @@ +--- NVIDIA-Linux-x86_64-396.18-no-compat32.orig/kernel/nvidia-drm/nvidia-drm-drv.c 2018-06-17 01:59:07.614238371 +0200 ++++ NVIDIA-Linux-x86_64-396.18-no-compat32.new/kernel/nvidia-drm/nvidia-drm-drv.c 2018-06-17 02:00:07.414316380 +0200 +@@ -634,26 +634,26 @@ + #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE) + DRM_IOCTL_DEF_DRV(NVIDIA_GEM_IMPORT_NVKMS_MEMORY, + nv_drm_gem_import_nvkms_memory_ioctl, +- DRM_CONTROL_ALLOW|DRM_RENDER_ALLOW|DRM_UNLOCKED), ++ DRM_RENDER_ALLOW|DRM_UNLOCKED), + #endif /* NV_DRM_ATOMIC_MODESET_AVAILABLE */ + + DRM_IOCTL_DEF_DRV(NVIDIA_GEM_IMPORT_USERSPACE_MEMORY, + nv_drm_gem_import_userspace_memory_ioctl, +- DRM_CONTROL_ALLOW|DRM_RENDER_ALLOW|DRM_UNLOCKED), ++ DRM_RENDER_ALLOW|DRM_UNLOCKED), + DRM_IOCTL_DEF_DRV(NVIDIA_GET_DEV_INFO, + nv_drm_get_dev_info_ioctl, +- DRM_CONTROL_ALLOW|DRM_RENDER_ALLOW|DRM_UNLOCKED), ++ DRM_RENDER_ALLOW|DRM_UNLOCKED), + + #if defined(NV_DRM_DRIVER_HAS_GEM_PRIME_RES_OBJ) + DRM_IOCTL_DEF_DRV(NVIDIA_FENCE_SUPPORTED, + nv_drm_fence_supported_ioctl, +- DRM_CONTROL_ALLOW|DRM_RENDER_ALLOW|DRM_UNLOCKED), ++ DRM_RENDER_ALLOW|DRM_UNLOCKED), + DRM_IOCTL_DEF_DRV(NVIDIA_FENCE_CONTEXT_CREATE, + nv_drm_fence_context_create_ioctl, +- DRM_CONTROL_ALLOW|DRM_RENDER_ALLOW|DRM_UNLOCKED), ++ DRM_RENDER_ALLOW|DRM_UNLOCKED), + DRM_IOCTL_DEF_DRV(NVIDIA_GEM_FENCE_ATTACH, + nv_drm_gem_fence_attach_ioctl, +- DRM_CONTROL_ALLOW|DRM_RENDER_ALLOW|DRM_UNLOCKED), ++ DRM_RENDER_ALLOW|DRM_UNLOCKED), + #endif + + DRM_IOCTL_DEF_DRV(NVIDIA_GET_CLIENT_CAPABILITY, +@@ -662,10 +662,10 @@ + #if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE) + DRM_IOCTL_DEF_DRV(NVIDIA_GET_CRTC_CRC32, + nv_drm_get_crtc_crc32_ioctl, +- DRM_CONTROL_ALLOW|DRM_RENDER_ALLOW|DRM_UNLOCKED), ++ DRM_RENDER_ALLOW|DRM_UNLOCKED), + DRM_IOCTL_DEF_DRV(NVIDIA_GEM_EXPORT_NVKMS_MEMORY, + nv_drm_gem_export_nvkms_memory_ioctl, +- DRM_CONTROL_ALLOW|DRM_RENDER_ALLOW|DRM_UNLOCKED), ++ DRM_RENDER_ALLOW|DRM_UNLOCKED), + #endif /* NV_DRM_ATOMIC_MODESET_AVAILABLE */ + }; + |