Module Name: src
Committed By: mrg
Date: Fri Mar 8 02:53:22 UTC 2019
Modified Files:
src/sys/external/bsd/drm2/drm: drm_gem_cma_helper.c
Log Message:
drm_gem_cma_fault() is a UVM fault function. return netbsd errnos.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/drm2/drm/drm_gem_cma_helper.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/drm/drm_gem_cma_helper.c
diff -u src/sys/external/bsd/drm2/drm/drm_gem_cma_helper.c:1.6 src/sys/external/bsd/drm2/drm/drm_gem_cma_helper.c:1.7
--- src/sys/external/bsd/drm2/drm/drm_gem_cma_helper.c:1.6 Mon Aug 27 15:27:43 2018
+++ src/sys/external/bsd/drm2/drm/drm_gem_cma_helper.c Fri Mar 8 02:53:22 2019
@@ -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 <jmcne...@invisible.ca>
@@ -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 @@ drm_gem_cma_fault(struct uvm_faultinfo *
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 @@ drm_gem_cma_fault(struct uvm_faultinfo *
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 @@ drm_gem_cma_fault(struct uvm_faultinfo *
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;
}
}
