Module Name: src
Committed By: riastradh
Date: Mon Aug 27 07:50:54 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_ttm.c
Log Message:
Kill legacy mmap in radeon like was done upstream.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c:1.12 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c:1.13
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c:1.12 Mon Aug 27 07:50:43 2018
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c Mon Aug 27 07:50:54 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: radeon_ttm.c,v 1.12 2018/08/27 07:50:43 riastradh Exp $ */
+/* $NetBSD: radeon_ttm.c,v 1.13 2018/08/27 07:50:54 riastradh Exp $ */
/*
* Copyright 2009 Jerome Glisse.
@@ -32,7 +32,7 @@
* Dave Airlie
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeon_ttm.c,v 1.12 2018/08/27 07:50:43 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_ttm.c,v 1.13 2018/08/27 07:50:54 riastradh Exp $");
#include <ttm/ttm_bo_api.h>
#include <ttm/ttm_bo_driver.h>
@@ -1093,11 +1093,10 @@ radeon_mmap_object(struct drm_device *de
return -EINVAL;
if (__predict_false((offset >> PAGE_SHIFT) < DRM_FILE_PAGE_OFFSET))
- return drm_mmap_object(dev, offset, size, prot, uobjp,
- uoffsetp, file);
- else
- return ttm_bo_mmap_object(&rdev->mman.bdev, offset, size, prot,
- uobjp, uoffsetp, file);
+ return -EINVAL;
+
+ return ttm_bo_mmap_object(&rdev->mman.bdev, offset, size, prot,
+ uobjp, uoffsetp, file);
}
#else
