From 5e81df0f103667d888bd346e148843f510a80adc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Tue, 25 Jul 2017 00:08:55 +0200 Subject: [PATCH] ac/surface: fix hybrid graphics where APU=GFX9, dGPU=older MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit v2: don't do it for compressed textures (bpp = 0) Cc: 17.2 Reviewed-by: Alex Deucher (v1) Reviewed-by: Nicolai Hähnle (v1) --- src/amd/common/ac_surface.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/amd/common/ac_surface.c b/src/amd/common/ac_surface.c index cd3d7b715cf..26f3729adf9 100644 --- a/src/amd/common/ac_surface.c +++ b/src/amd/common/ac_surface.c @@ -257,6 +257,18 @@ static int gfx6_compute_level(ADDR_HANDLE addrlib, AddrSurfInfoIn->width = u_minify(config->info.width, level); AddrSurfInfoIn->height = u_minify(config->info.height, level); + /* Make GFX6 linear surfaces compatible with GFX9 for hybrid graphics, + * because GFX9 needs linear alignment of 256 bytes. + */ + if (config->info.levels == 1 && + AddrSurfInfoIn->tileMode == ADDR_TM_LINEAR_ALIGNED && + AddrSurfInfoIn->bpp) { + unsigned alignment = 256 / (AddrSurfInfoIn->bpp / 8); + + assert(util_is_power_of_two(AddrSurfInfoIn->bpp)); + AddrSurfInfoIn->width = align(AddrSurfInfoIn->width, alignment); + } + if (config->is_3d) AddrSurfInfoIn->numSlices = u_minify(config->info.depth, level); else if (config->is_cube) -- 2.30.2