Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/external/bsd/drm2/drm drm_gem_cma_fault() is a UVM fault...



details:   https://anonhg.NetBSD.org/src/rev/0be1392b7321
branches:  trunk
changeset: 449474:0be1392b7321
user:      mrg <mrg%NetBSD.org@localhost>
date:      Fri Mar 08 02:53:22 2019 +0000

description:
drm_gem_cma_fault() is a UVM fault function.  return netbsd errnos.

diffstat:

 sys/external/bsd/drm2/drm/drm_gem_cma_helper.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (45 lines):

diff -r 3f958eac4ba0 -r 0be1392b7321 sys/external/bsd/drm2/drm/drm_gem_cma_helper.c
--- a/sys/external/bsd/drm2/drm/drm_gem_cma_helper.c    Thu Mar 07 22:08:59 2019 +0000
+++ b/sys/external/bsd/drm2/drm/drm_gem_cma_helper.c    Fri Mar 08 02:53:22 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_gem_cma_helper.c,v 1.6 2018/08/27 15:27:43 riastradh Exp $ */
+/* $NetBSD: drm_gem_cma_helper.c,v 1.7 2019/03/08 02:53:22 mrg Exp $ */
 
 /*-
  * Copyright (c) 2015-2017 Jared McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_gem_cma_helper.c,v 1.6 2018/08/27 15:27:43 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_gem_cma_helper.c,v 1.7 2019/03/08 02:53:22 mrg Exp $");
 
 #include <drm/drmP.h>
 #include <drm/drm_gem_cma_helper.h>
@@ -194,7 +194,7 @@
        vm_prot_t mapprot;
 
        if (UVM_ET_ISCOPYONWRITE(entry))
-               return -EIO;
+               return EIO;
 
        curr_offset = entry->offset + (vaddr - entry->start);
        curr_va = vaddr;
@@ -210,7 +210,7 @@
                mdpgno = bus_dmamem_mmap(obj->dmat, obj->dmasegs, 1,
                    curr_offset, access_type, BUS_DMA_PREFETCHABLE);
                if (mdpgno == -1) {
-                       retval = -EIO;
+                       retval = EIO;
                        break;
                }
                paddr = pmap_phys_address(mdpgno);
@@ -222,7 +222,7 @@
                        pmap_update(ufi->orig_map->pmap);
                        uvmfault_unlockall(ufi, ufi->entry->aref.ar_amap, uobj);
                        uvm_wait("drm_gem_cma_fault");
-                       return -ERESTART;
+                       return ERESTART;
                }
        }
 



Home | Main Index | Thread Index | Old Index