From 9f4dab0f2d370f0d3768e0951fa2871b0bdd131b Mon Sep 17 00:00:00 2001 From: Boris Brezillon Date: Wed, 19 May 2021 10:56:49 +0200 Subject: [PATCH] pan/blit: Fix a NULL dereference in the preload path The ZS view can be NULL if a stencil-only buffer is attached to the FB. Fixes: 1de393fec539 ("panfrost: Fix ZS reloading on Bifrost v6") Signed-off-by: Boris Brezillon Reviewed-by: Alyssa Rosenzweig Reviewed-by: Tomeu Vizoso Part-of: --- src/panfrost/lib/pan_blitter.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/panfrost/lib/pan_blitter.c b/src/panfrost/lib/pan_blitter.c index a17fab7dee1..23ba41169d6 100644 --- a/src/panfrost/lib/pan_blitter.c +++ b/src/panfrost/lib/pan_blitter.c @@ -1132,7 +1132,9 @@ pan_preload_emit_pre_frame_dcd(struct pan_pool *desc_pool, pan_preload_emit_dcd(desc_pool, fb, zs, coords, tsd, rsd, dcd, always_write); if (zs) { - enum pipe_format fmt = fb->zs.view.zs->image->layout.format; + enum pipe_format fmt = fb->zs.view.zs ? + fb->zs.view.zs->image->layout.format : + fb->zs.view.s->image->layout.format; bool always = false; /* If we're dealing with a combined ZS resource and only one