From 506f5d9bda64fc07ee1a216cb3aeef98491c6365 Mon Sep 17 00:00:00 2001 From: Pierre-Eric Pelloux-Prayer Date: Mon, 11 May 2020 09:18:49 +0200 Subject: [PATCH] ac/surface: remove shadowing declaration MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Fixes: 7691de0dcef ("ac/surface,radeonsi: move the set/get_bo_metadata code to ac_surface.c") Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/2929 Reviewed-by: Samuel Pitoiset Reviewed-by: Marek Olšák Part-of: --- src/amd/common/ac_surface.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/amd/common/ac_surface.c b/src/amd/common/ac_surface.c index 98f1276f425..1c2c0d8dad2 100644 --- a/src/amd/common/ac_surface.c +++ b/src/amd/common/ac_surface.c @@ -2000,8 +2000,8 @@ void ac_surface_get_bo_metadata(const struct radeon_info *info, uint64_t dcc_offset = 0; if (surf->dcc_offset) { - uint64_t dcc_offset = surf->display_dcc_offset ? surf->display_dcc_offset - : surf->dcc_offset; + dcc_offset = surf->display_dcc_offset ? surf->display_dcc_offset + : surf->dcc_offset; assert((dcc_offset >> 8) != 0 && (dcc_offset >> 8) < (1 << 24)); } -- 2.30.2