Skip to contentSkip to conversation

drm/msm: remove an unused-but-set variable

PATCH In review Arnd Bergmann 2 participants 2 messages Apr 5, 2024

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/msm: remove an unused-but-set variable

From: Arnd Bergmann <[email protected]>

The modification to a6xx_get_shader_block() had no effect other than causing a warning:

drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c:843:6: error: variable 'out' set but not used [-Werror,-Wunused-but-set-variable]

        u64 out = dumper->iova + A6XX_CD_DATA_OFFSET;

Revert this part of the previous patch.

Fixes 64d6255650d4 ("drm/msm: More fully implement devcoredump for a7xx")
---
 drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c | 3 ---
 1 file changed, 3 deletions(-)
drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c +0 -3
index 1f5245fc2cdc..d4e1ebfcb021 100644
@@ -840,7 +840,6 @@ static void a6xx_get_shader_block(struct msm_gpu *gpu,
 		struct a6xx_crashdumper *dumper)
 {
 	u64 *in = dumper->ptr;
-	u64 out = dumper->iova + A6XX_CD_DATA_OFFSET;
 	size_t datasize = block->size * A6XX_NUM_SHADER_BANKS * sizeof(u32);
 	int i;
 
@@ -853,8 +852,6 @@ static void a6xx_get_shader_block(struct msm_gpu *gpu,
 
 		in += CRASHDUMP_READ(in, REG_A6XX_HLSQ_DBG_AHB_READ_APERTURE,
 			block->size, dumper->iova + A6XX_CD_DATA_OFFSET);
-
-		out += block->size * sizeof(u32);
 	}
 
 	CRASHDUMP_FINI(in);
Signature · 1 line
2.39.2
#1 lore raw
Quoted 6 lines · Arnd Bergmann

From: Arnd Bergmann <[email protected]>

The modification to a6xx_get_shader_block() had no effect other than causing a warning:

Quoted 7 lines

drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c:843:6: error: variable 'out' set but not used [-Werror,-Wunused-but-set-variable]

        u64 out = dumper->iova + A6XX_CD_DATA_OFFSET;

Revert this part of the previous patch.

Fixes 64d6255650d4 ("drm/msm: More fully implement devcoredump for a7xx")

Unfortunately this fix is not correct. The proper patch is present at
https://patchwork.freedesktop.org/patch/584955/?series=131663&rev=1

Quoted 28 lines
---
 drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c | 3 ---
 1 file changed, 3 deletions(-)
drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c +0 -4
index 1f5245fc2cdc..d4e1ebfcb021 100644
@@ -840,7 +840,6 @@ static void a6xx_get_shader_block(struct msm_gpu *gpu,
                struct a6xx_crashdumper *dumper)
 {
        u64 *in = dumper->ptr;
-       u64 out = dumper->iova + A6XX_CD_DATA_OFFSET;
        size_t datasize = block->size * A6XX_NUM_SHADER_BANKS * sizeof(u32);
        int i;
 
@@ -853,8 +852,6 @@ static void a6xx_get_shader_block(struct msm_gpu *gpu,
 
                in += CRASHDUMP_READ(in, REG_A6XX_HLSQ_DBG_AHB_READ_APERTURE,
                        block->size, dumper->iova + A6XX_CD_DATA_OFFSET);
-
-               out += block->size * sizeof(u32);
        }
 
        CRASHDUMP_FINI(in);
--

2.39.2

Signature · 2 lines
With best wishes
Dmitry