From 7c47874d45663d32be866598a62694f24c3e15d0 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Thu, 13 Aug 2020 19:08:38 -0400 Subject: [PATCH] panfrost: Fix WRITES_GLOBAL bit Signed-off-by: Alyssa Rosenzweig Reviewed-by: Tomeu Vizoso Fixes: dce7722ef89 ("panfrost: Handle writes_memory correctly") Part-of: (cherry picked from commit 39bf1fb3221c0ab79e4609ca3588e2eeb9e3e2da) --- .pick_status.json | 2 +- src/gallium/drivers/panfrost/pan_cmdstream.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index f144536df9d..0dc4cc6a395 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1300,7 +1300,7 @@ "description": "panfrost: Fix WRITES_GLOBAL bit", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "dce7722ef89100e5dea337064a9d6631bb18822a" }, diff --git a/src/gallium/drivers/panfrost/pan_cmdstream.c b/src/gallium/drivers/panfrost/pan_cmdstream.c index cec1c715632..3854e4d56c2 100644 --- a/src/gallium/drivers/panfrost/pan_cmdstream.c +++ b/src/gallium/drivers/panfrost/pan_cmdstream.c @@ -345,7 +345,7 @@ panfrost_shader_meta_init(struct panfrost_context *ctx, meta->midgard1.flags_lo = 0x20; meta->midgard1.uniform_buffer_count = panfrost_ubo_count(ctx, st); - SET_BIT(meta->midgard1.flags_hi, MALI_WRITES_GLOBAL, ss->writes_global); + SET_BIT(meta->midgard1.flags_lo, MALI_WRITES_GLOBAL, ss->writes_global); } }