Module: Mesa Branch: staging/21.2 Commit: ee6739d4d0aa9ff4c10157bc36e1c1ef57368729 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ee6739d4d0aa9ff4c10157bc36e1c1ef57368729
Author: Alyssa Rosenzweig <[email protected]> Date: Tue Aug 17 17:06:56 2021 +0000 panfrost: Remove writer = NULL assignments These already happened. Signed-off-by: Alyssa Rosenzweig <[email protected]> Cc: mesa-stable Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12528> (cherry picked from commit afebbadda8db4d6b832183ccf95c51a6e117899d) --- .pick_status.json | 2 +- src/gallium/drivers/panfrost/pan_job.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index f90123d473e..8f10bbec674 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1138,7 +1138,7 @@ "description": "panfrost: Remove writer = NULL assignments", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/gallium/drivers/panfrost/pan_job.c b/src/gallium/drivers/panfrost/pan_job.c index 32376dbea0e..736f93e2e50 100644 --- a/src/gallium/drivers/panfrost/pan_job.c +++ b/src/gallium/drivers/panfrost/pan_job.c @@ -935,7 +935,6 @@ panfrost_flush_writer(struct panfrost_context *ctx, { if (rsrc->track.writer) { panfrost_batch_submit(rsrc->track.writer, ctx->syncobj, ctx->syncobj); - rsrc->track.writer = NULL; } } @@ -952,8 +951,6 @@ panfrost_flush_batches_accessing_rsrc(struct panfrost_context *ctx, panfrost_batch_submit(batch, ctx->syncobj, ctx->syncobj); } - - rsrc->track.writer = NULL; } void
