From abd4ab6ffab193b430e5e3ef4f5429cae9f4221b Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Thu, 13 May 2021 12:38:46 -0400 Subject: [PATCH] zink: stop overwriting buffer map pointers for stream uploader this breaks the driver! the uploader always maps its own pointer, so modifying that at any point just explodes things later Fixes: d179c5d28e6 ("zink: implement threaded context") Reviewed-by: Dave Airlie Part-of: (cherry picked from commit 8e2ac24482d87b10e2619c2de67ae0bfb33e98c4) --- .pick_status.json | 2 +- src/gallium/drivers/zink/zink_resource.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 8aab9d76614..6f690fdf51a 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -310,7 +310,7 @@ "description": "zink: stop overwriting buffer map pointers for stream uploader", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "d179c5d28e6ae86dd95d906fff8197e35270dad8" }, diff --git a/src/gallium/drivers/zink/zink_resource.c b/src/gallium/drivers/zink/zink_resource.c index 918a5c5b4af..ec5f539fde3 100644 --- a/src/gallium/drivers/zink/zink_resource.c +++ b/src/gallium/drivers/zink/zink_resource.c @@ -883,7 +883,6 @@ buffer_transfer_map(struct zink_context *ctx, struct zink_resource *res, unsigne (struct pipe_resource **)&trans->staging_res, (void **)&ptr); res = zink_resource(trans->staging_res); trans->offset = offset; - res->obj->map = ptr; } else { /* At this point, the buffer is always idle (we checked it above). */ usage |= PIPE_MAP_UNSYNCHRONIZED;