From 3771988c55b4aa763c9421fdbdc0fe389407226f Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Wed, 16 Jun 2021 02:34:18 -0700 Subject: [PATCH] zink: do not unmap dt-buffers twice Seems I missed that we already did an unconditional unmap here, and forgot to remove it. Whoops. Fixes: 5159f406d ("zink: use gallium api to copy to display-target") Reviewed-By: Mike Blumenkrantz Part-of: (cherry picked from commit 0bb47032922b6faf043311ada0407bb43460de0c) --- .pick_status.json | 2 +- src/gallium/drivers/zink/zink_screen.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 74109e8001c..eb726330477 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1156,7 +1156,7 @@ "description": "zink: do not unmap dt-buffers twice", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "5159f406d895c6a253e90c6b076045ac133e55af" }, diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c index 610fdd7597b..7bbf1bc8d5d 100644 --- a/src/gallium/drivers/zink/zink_screen.c +++ b/src/gallium/drivers/zink/zink_screen.c @@ -1061,8 +1061,6 @@ zink_flush_frontbuffer(struct pipe_screen *pscreen, winsys->displaytarget_unmap(winsys, res->dt); } - winsys->displaytarget_unmap(winsys, res->dt); - assert(res->dt); if (res->dt) winsys->displaytarget_display(winsys, res->dt, winsys_drawable_handle, sub_box);