modeco80
93dd13b3d1
the eventfd fix is currently not enabled yet. need to add the follow_pfn patch next for 6.10/6.11 support
90 lines
4.3 KiB
Diff
90 lines
4.3 KiB
Diff
diff --git a/usr/src/nvidia-535.129.03-orig/nvidia-drm/nvidia-drm-drv.c b/kernel/nvidia-drm/nvidia-drm-drv.c
|
|
index 6c68d82..6044b8f 100644
|
|
--- a/usr/src/nvidia-535.129.03-orig/nvidia-drm/nvidia-drm-drv.c
|
|
+++ b/kernel/nvidia-drm/nvidia-drm-drv.c
|
|
@@ -1287,29 +1287,29 @@ static const struct drm_ioctl_desc nv_drm_ioctls[] = {
|
|
#if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
|
|
DRM_IOCTL_DEF_DRV(NVIDIA_GEM_IMPORT_NVKMS_MEMORY,
|
|
nv_drm_gem_import_nvkms_memory_ioctl,
|
|
- DRM_RENDER_ALLOW|DRM_UNLOCKED),
|
|
+ DRM_RENDER_ALLOW),
|
|
#endif /* NV_DRM_ATOMIC_MODESET_AVAILABLE */
|
|
|
|
DRM_IOCTL_DEF_DRV(NVIDIA_GEM_IMPORT_USERSPACE_MEMORY,
|
|
nv_drm_gem_import_userspace_memory_ioctl,
|
|
- DRM_RENDER_ALLOW|DRM_UNLOCKED),
|
|
+ DRM_RENDER_ALLOW),
|
|
DRM_IOCTL_DEF_DRV(NVIDIA_GEM_MAP_OFFSET,
|
|
nv_drm_gem_map_offset_ioctl,
|
|
- DRM_RENDER_ALLOW|DRM_UNLOCKED),
|
|
+ DRM_RENDER_ALLOW),
|
|
DRM_IOCTL_DEF_DRV(NVIDIA_GET_DEV_INFO,
|
|
nv_drm_get_dev_info_ioctl,
|
|
- DRM_RENDER_ALLOW|DRM_UNLOCKED),
|
|
+ DRM_RENDER_ALLOW),
|
|
|
|
#if defined(NV_DRM_FENCE_AVAILABLE)
|
|
DRM_IOCTL_DEF_DRV(NVIDIA_FENCE_SUPPORTED,
|
|
nv_drm_fence_supported_ioctl,
|
|
- DRM_RENDER_ALLOW|DRM_UNLOCKED),
|
|
+ DRM_RENDER_ALLOW),
|
|
DRM_IOCTL_DEF_DRV(NVIDIA_PRIME_FENCE_CONTEXT_CREATE,
|
|
nv_drm_prime_fence_context_create_ioctl,
|
|
- DRM_RENDER_ALLOW|DRM_UNLOCKED),
|
|
+ DRM_RENDER_ALLOW),
|
|
DRM_IOCTL_DEF_DRV(NVIDIA_GEM_PRIME_FENCE_ATTACH,
|
|
nv_drm_gem_prime_fence_attach_ioctl,
|
|
- DRM_RENDER_ALLOW|DRM_UNLOCKED),
|
|
+ DRM_RENDER_ALLOW),
|
|
#endif
|
|
|
|
DRM_IOCTL_DEF_DRV(NVIDIA_GET_CLIENT_CAPABILITY,
|
|
@@ -1318,37 +1318,37 @@ static const struct drm_ioctl_desc nv_drm_ioctls[] = {
|
|
#if defined(NV_DRM_ATOMIC_MODESET_AVAILABLE)
|
|
DRM_IOCTL_DEF_DRV(NVIDIA_GET_CRTC_CRC32,
|
|
nv_drm_get_crtc_crc32_ioctl,
|
|
- DRM_RENDER_ALLOW|DRM_UNLOCKED),
|
|
+ DRM_RENDER_ALLOW),
|
|
DRM_IOCTL_DEF_DRV(NVIDIA_GET_CRTC_CRC32_V2,
|
|
nv_drm_get_crtc_crc32_v2_ioctl,
|
|
- DRM_RENDER_ALLOW|DRM_UNLOCKED),
|
|
+ DRM_RENDER_ALLOW),
|
|
DRM_IOCTL_DEF_DRV(NVIDIA_GEM_EXPORT_NVKMS_MEMORY,
|
|
nv_drm_gem_export_nvkms_memory_ioctl,
|
|
- DRM_RENDER_ALLOW|DRM_UNLOCKED),
|
|
+ DRM_RENDER_ALLOW),
|
|
DRM_IOCTL_DEF_DRV(NVIDIA_GEM_ALLOC_NVKMS_MEMORY,
|
|
nv_drm_gem_alloc_nvkms_memory_ioctl,
|
|
- DRM_RENDER_ALLOW|DRM_UNLOCKED),
|
|
+ DRM_RENDER_ALLOW),
|
|
DRM_IOCTL_DEF_DRV(NVIDIA_GEM_EXPORT_DMABUF_MEMORY,
|
|
nv_drm_gem_export_dmabuf_memory_ioctl,
|
|
- DRM_RENDER_ALLOW|DRM_UNLOCKED),
|
|
+ DRM_RENDER_ALLOW),
|
|
DRM_IOCTL_DEF_DRV(NVIDIA_GEM_IDENTIFY_OBJECT,
|
|
nv_drm_gem_identify_object_ioctl,
|
|
- DRM_RENDER_ALLOW|DRM_UNLOCKED),
|
|
+ DRM_RENDER_ALLOW),
|
|
DRM_IOCTL_DEF_DRV(NVIDIA_DMABUF_SUPPORTED,
|
|
nv_drm_dmabuf_supported_ioctl,
|
|
- DRM_RENDER_ALLOW|DRM_UNLOCKED),
|
|
+ DRM_RENDER_ALLOW),
|
|
DRM_IOCTL_DEF_DRV(NVIDIA_GET_DPY_ID_FOR_CONNECTOR_ID,
|
|
nv_drm_get_dpy_id_for_connector_id_ioctl,
|
|
- DRM_RENDER_ALLOW|DRM_UNLOCKED),
|
|
+ DRM_RENDER_ALLOW),
|
|
DRM_IOCTL_DEF_DRV(NVIDIA_GET_CONNECTOR_ID_FOR_DPY_ID,
|
|
nv_drm_get_connector_id_for_dpy_id_ioctl,
|
|
- DRM_RENDER_ALLOW|DRM_UNLOCKED),
|
|
+ DRM_RENDER_ALLOW),
|
|
DRM_IOCTL_DEF_DRV(NVIDIA_GRANT_PERMISSIONS,
|
|
nv_drm_grant_permission_ioctl,
|
|
- DRM_UNLOCKED|DRM_MASTER),
|
|
+ DRM_MASTER),
|
|
DRM_IOCTL_DEF_DRV(NVIDIA_REVOKE_PERMISSIONS,
|
|
nv_drm_revoke_permission_ioctl,
|
|
- DRM_UNLOCKED|DRM_MASTER),
|
|
+ DRM_MASTER),
|
|
#endif /* NV_DRM_ATOMIC_MODESET_AVAILABLE */
|
|
};
|
|
|