OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

crocus/gen4: restrict memcpy mapping to gen5

Browse Source 
This is due to gen4 + 4.5 having some rather strange swizzling
that we can't actually detect properly in userspace

Fixes: f3630548f1 ("crocus: initial gallium driver for Intel gfx 4-7")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12058>
This commit is contained in:
Dave Airlie
2021-07-26 15:27:52 +10:00
committed by Marge Bot
parent 856e2b7529
commit 5bf6ec31cc
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/gallium/drivers/crocus/crocus_resource.c
View File

@@ -1577,6 +1577,7 @@ crocus_transfer_map(struct pipe_context *ctx,
struct crocus_context *ice = (struct crocus_context *)ctx;
struct crocus_resource *res = (struct crocus_resource *)resource;
struct isl_surf *surf = &res->surf;
struct crocus_screen *screen = (struct crocus_screen *)ctx->screen;
if (usage & PIPE_MAP_DISCARD_WHOLE_RESOURCE) {
/* Replace the backing storage with a fresh buffer for non-async maps */
@@ -1690,7 +1691,7 @@ crocus_transfer_map(struct pipe_context *ctx,
if (surf->tiling == ISL_TILING_W) {
/* TODO: Teach crocus_map_tiled_memcpy about W-tiling... */
crocus_map_s8(map);
} else if (surf->tiling != ISL_TILING_LINEAR) {
} else if (surf->tiling != ISL_TILING_LINEAR && screen->devinfo.ver > 4) {
crocus_map_tiled_memcpy(map);
} else {
crocus_map_direct(map);