Merge remote-tracking branch 'mesa/17.0' into marshmallow-x86

diff --cc src/gallium/drivers/nouveau/nouveau_buffer.c
index b164953,2c60441..e14ba7f
--- 1/src/gallium/drivers/nouveau/nouveau_buffer.c
--- 2/src/gallium/drivers/nouveau/nouveau_buffer.c
+++ b/src/gallium/drivers/nouveau/nouveau_buffer.c
@@@ -486,12 -473,11 +483,13 @@@ nouveau_buffer_transfer_map(struct pipe
      * complete its operation, or set up a staging area to perform our work in.
      */
     if (nouveau_buffer_busy(buf, usage & PIPE_TRANSFER_READ_WRITE)) {
-       if (unlikely(usage & PIPE_TRANSFER_DISCARD_WHOLE_RESOURCE)) {
+       if (unlikely(usage & (PIPE_TRANSFER_DISCARD_WHOLE_RESOURCE |
+                             PIPE_TRANSFER_PERSISTENT))) {
           /* Discarding was not possible, must sync because
            * subsequent transfers might use UNSYNCHRONIZED. */
 +         pipe_mutex_lock(screen->push_mutex);
           nouveau_buffer_sync(nv, buf, usage & PIPE_TRANSFER_READ_WRITE);
 +         pipe_mutex_unlock(screen->push_mutex);
        } else
        if (usage & PIPE_TRANSFER_DISCARD_RANGE) {
           /* The whole range is being discarded, so it doesn't matter what was

diff --cc src/gallium/drivers/nouveau/nvc0/nvc0_screen.c
Simple merge

diff --cc src/gallium/state_trackers/dri/dri2.c
Simple merge