[src/netbsd-9]: src/sys/external/bsd/drm2/include/drm Pull up following revis...

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

details:   https://anonhg.NetBSD.org/src/rev/7f3d35faa1d0
branches:  netbsd-9
changeset: 746076:7f3d35faa1d0
user:      martin <martin%NetBSD.org@localhost>
date:      Sat Mar 21 15:27:40 2020 +0000

description:
Pull up following revision(s) (requested by mrg in ticket #791):

        sys/external/bsd/drm2/include/drm/bus_dma_hacks.h: revision 1.20

in bus_dmamap_load_pglist() try a 32-element array of
bus_dma_segment_t's before attempting to allocate.
this hopefully avoids hangs i've had in X since updating
from netbsd-8 to netbsd-9 that i've tracked down to this
function failing with ENOMEM.

XXX: maybe can avoid the alloc entirely by batching these
calls in 32 segments each.

XXX pullup-9

diffstat:

 sys/external/bsd/drm2/include/drm/bus_dma_hacks.h |  33 ++++++++++++++++------
 1 files changed, 24 insertions(+), 9 deletions(-)

diffs (68 lines):

diff -r b3485015142f -r 7f3d35faa1d0 sys/external/bsd/drm2/include/drm/bus_dma_hacks.h
--- a/sys/external/bsd/drm2/include/drm/bus_dma_hacks.h Sat Mar 21 15:25:24 2020 +0000
+++ b/sys/external/bsd/drm2/include/drm/bus_dma_hacks.h Sat Mar 21 15:27:40 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bus_dma_hacks.h,v 1.17.4.1 2019/11/06 09:48:32 martin Exp $    */
+/*     $NetBSD: bus_dma_hacks.h,v 1.17.4.2 2020/03/21 15:27:40 martin Exp $    */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -118,12 +118,15 @@
 #endif
 }
 
+#define MAX_STACK_SEGS 32      /* XXXMRG: 512 bytes on 16 byte seg platforms */
+
 static inline int
 bus_dmamap_load_pglist(bus_dma_tag_t tag, bus_dmamap_t map,
     struct pglist *pglist, bus_size_t size, int flags)
 {
        km_flag_t kmflags;
        bus_dma_segment_t *segs;
+       bus_dma_segment_t stacksegs[MAX_STACK_SEGS];
        int nsegs, seg;
        struct vm_page *page;
        int error;
@@ -136,14 +139,23 @@
        }
 
        KASSERT(nsegs <= (SIZE_MAX / sizeof(segs[0])));
-       switch (flags & (BUS_DMA_WAITOK|BUS_DMA_NOWAIT)) {
-       case BUS_DMA_WAITOK:    kmflags = KM_SLEEP;     break;
-       case BUS_DMA_NOWAIT:    kmflags = KM_NOSLEEP;   break;
-       default:                panic("invalid flags: %d", flags);
+       if (nsegs > MAX_STACK_SEGS) {
+               switch (flags & (BUS_DMA_WAITOK|BUS_DMA_NOWAIT)) {
+               case BUS_DMA_WAITOK:
+                       kmflags = KM_SLEEP;
+                       break;
+               case BUS_DMA_NOWAIT:
+                       kmflags = KM_NOSLEEP;
+                       break;
+               default:
+                       panic("invalid flags: %d", flags);
+               }
+               segs = kmem_alloc((nsegs * sizeof(segs[0])), kmflags);
+               if (segs == NULL)
+                       return ENOMEM;
+       } else {
+               segs = stacksegs;
        }
-       segs = kmem_alloc((nsegs * sizeof(segs[0])), kmflags);
-       if (segs == NULL)
-               return ENOMEM;
 
        seg = 0;
        TAILQ_FOREACH(page, pglist, pageq.queue) {
@@ -166,7 +178,10 @@
 fail1: __unused
        bus_dmamap_unload(tag, map);
 fail0: KASSERT(error);
-out:   kmem_free(segs, (nsegs * sizeof(segs[0])));
+out:   if (segs != stacksegs) {
+               KASSERT(nsegs > MAX_STACK_SEGS);
+               kmem_free(segs, (nsegs * sizeof(segs[0])));
+       }
        return error;
 }