diff --git a/.pick_status.json b/.pick_status.json
index 0f2305a69be..e0c3a51cf59 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1574,7 +1574,7 @@
         "description": "nouveau: workaround linear/z rendering interaction",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null
diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_state_validate.c b/src/gallium/drivers/nouveau/nvc0/nvc0_state_validate.c
index 0c567966a0b..f09db273ede 100644
--- a/src/gallium/drivers/nouveau/nvc0/nvc0_state_validate.c
+++ b/src/gallium/drivers/nouveau/nvc0/nvc0_state_validate.c
@@ -149,6 +149,7 @@ nvc0_validate_fb(struct nvc0_context *nvc0)
    unsigned ms_mode = NVC0_3D_MULTISAMPLE_MODE_MS1;
    unsigned nr_cbufs = fb->nr_cbufs;
    bool serialize = false;
+   bool cbuf_is_linear = false;
 
    nouveau_bufctx_reset(nvc0->bufctx_3d, NVC0_BIND_3D_FB);
 
@@ -204,7 +205,7 @@ nvc0_validate_fb(struct nvc0_context *nvc0)
 
          nvc0_resource_fence(nvc0, res, NOUVEAU_BO_WR);
 
-         assert(!fb->zsbuf);
+         cbuf_is_linear = true;
       }
 
       if (res->status & NOUVEAU_BUFFER_STATUS_GPU_READING)
@@ -216,7 +217,7 @@ nvc0_validate_fb(struct nvc0_context *nvc0)
       BCTX_REFN(nvc0->bufctx_3d, 3D_FB, res, WR);
    }
 
-   if (fb->zsbuf) {
+   if (fb->zsbuf && !cbuf_is_linear) {
       struct nv50_miptree *mt = nv50_miptree(fb->zsbuf->texture);
       struct nv50_surface *sf = nv50_surface(fb->zsbuf);
       int unk = mt->base.base.target == PIPE_TEXTURE_2D;