]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm/radeon/r600_cs: clean up of dead code in r600_cs
authorBrahmajit Das <listout@listout.xyz>
Mon, 11 Aug 2025 09:21:25 +0000 (14:51 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 15 Oct 2025 09:56:30 +0000 (11:56 +0200)
[ Upstream commit 260dcf5b06d519bcf27a5dfdb5c626821a55c170 ]

GCC 16 enables -Werror=unused-but-set-variable= which results in build
error with the following message.

drivers/gpu/drm/radeon/r600_cs.c: In function ‘r600_texture_size’:
drivers/gpu/drm/radeon/r600_cs.c:1411:29: error: variable ‘level’ set but not used [-Werror=unused-but-set-variable=]
 1411 |         unsigned offset, i, level;
      |                             ^~~~~
cc1: all warnings being treated as errors
make[6]: *** [scripts/Makefile.build:287: drivers/gpu/drm/radeon/r600_cs.o] Error 1

level although is set, but in never used in the function
r600_texture_size. Thus resulting in dead code and this error getting
triggered.

Fixes: 60b212f8ddcd ("drm/radeon: overhaul texture checking. (v3)")
Acked-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Brahmajit Das <listout@listout.xyz>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/gpu/drm/radeon/r600_cs.c

index 780352f794e91d3003dbb0c15085a4bf8640eb38..b63d935391dcd14ea0c2de6e12b8c126def452af 100644 (file)
@@ -1408,7 +1408,7 @@ static void r600_texture_size(unsigned nfaces, unsigned blevel, unsigned llevel,
                              unsigned block_align, unsigned height_align, unsigned base_align,
                              unsigned *l0_size, unsigned *mipmap_size)
 {
-       unsigned offset, i, level;
+       unsigned offset, i;
        unsigned width, height, depth, size;
        unsigned blocksize;
        unsigned nbx, nby;
@@ -1420,7 +1420,7 @@ static void r600_texture_size(unsigned nfaces, unsigned blevel, unsigned llevel,
        w0 = r600_mip_minify(w0, 0);
        h0 = r600_mip_minify(h0, 0);
        d0 = r600_mip_minify(d0, 0);
-       for(i = 0, offset = 0, level = blevel; i < nlevels; i++, level++) {
+       for (i = 0, offset = 0; i < nlevels; i++) {
                width = r600_mip_minify(w0, i);
                nbx = r600_fmt_get_nblocksx(format, width);