[src/trunk]: src/sys/external/bsd/drm2/dist/drm/radeon Kill legacy mmap in ra...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/041c1d8981af
branches:  trunk
changeset: 366104:041c1d8981af
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon Aug 27 07:50:54 2018 +0000

description:
Kill legacy mmap in radeon like was done upstream.

diffstat:

 sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c |  13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diffs (34 lines):

diff -r 10f2ff5023d8 -r 041c1d8981af sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c
--- a/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c        Mon Aug 27 07:50:43 2018 +0000
+++ b/sys/external/bsd/drm2/dist/drm/radeon/radeon_ttm.c        Mon Aug 27 07:50:54 2018 +0000
@@ -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 @@
                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