svn commit: r278852 - head/sys/dev/usb/video

[Hans Petter Selasky]

Author: hselasky
Date: Mon Feb 16 15:46:16 2015
New Revision: 278852
URL: https://svnweb.freebsd.org/changeset/base/278852

Log:
  Avoid recursive locking.

Modified:
  head/sys/dev/usb/video/udl.c

Modified: head/sys/dev/usb/video/udl.c
==============================================================================
--- head/sys/dev/usb/video/udl.c        Mon Feb 16 15:39:51 2015        
(r278851)
+++ head/sys/dev/usb/video/udl.c        Mon Feb 16 15:46:16 2015        
(r278852)
@@ -428,11 +428,10 @@ udl_fb_setblankmode(void *arg, int mode)
 }
 
 static struct udl_cmd_buf *
-udl_cmd_buf_alloc(struct udl_softc *sc, int flags)
+udl_cmd_buf_alloc_locked(struct udl_softc *sc, int flags)
 {
        struct udl_cmd_buf *cb;
 
-       UDL_LOCK(sc);
        while ((cb = TAILQ_FIRST(&sc->sc_cmd_buf_free)) == NULL) {
                if (flags != M_WAITOK)
                        break;
@@ -442,6 +441,16 @@ udl_cmd_buf_alloc(struct udl_softc *sc, 
                TAILQ_REMOVE(&sc->sc_cmd_buf_free, cb, entry);
                cb->off = 0;
        }
+       return (cb);
+}
+
+static struct udl_cmd_buf *
+udl_cmd_buf_alloc(struct udl_softc *sc, int flags)
+{
+       struct udl_cmd_buf *cb;
+
+       UDL_LOCK(sc);
+       cb = udl_cmd_buf_alloc_locked(sc, flags);
        UDL_UNLOCK(sc);
        return (cb);
 }
@@ -465,7 +474,7 @@ udl_cmd_buf_send(struct udl_softc *sc, s
 }
 
 static struct udl_cmd_buf *
-udl_fb_synchronize(struct udl_softc *sc)
+udl_fb_synchronize_locked(struct udl_softc *sc)
 {
        const uint32_t max = udl_get_fb_size(sc);
 
@@ -482,7 +491,7 @@ udl_fb_synchronize(struct udl_softc *sc)
                if (bcmp(sc->sc_fb_addr + sc->sc_sync_off, sc->sc_fb_copy + 
sc->sc_sync_off, delta) != 0) {
                        struct udl_cmd_buf *cb;
 
-                       cb = udl_cmd_buf_alloc(sc, M_NOWAIT);
+                       cb = udl_cmd_buf_alloc_locked(sc, M_NOWAIT);
                        if (cb == NULL)
                                goto done;
                        memcpy(sc->sc_fb_copy + sc->sc_sync_off,
@@ -518,7 +527,7 @@ tr_setup:
                for (i = 0; i != UDL_CMD_MAX_FRAMES; i++) {
                        cb = TAILQ_FIRST(&sc->sc_cmd_buf_pending);
                        if (cb == NULL) {
-                               cb = udl_fb_synchronize(sc);
+                               cb = udl_fb_synchronize_locked(sc);
                                if (cb == NULL)
                                        break;
                        } else {
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"