| Message ID | 20240405155855.3672853-1-arnd@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/msm: remove an unused-but-set variable | expand |
On Fri, 5 Apr 2024 at 18:59, Arnd Bergmann <arnd@kernel.org> wrote: > > From: Arnd Bergmann <arnd@arndb.de> > > 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") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Unfortunately this fix is not correct. The proper patch is present at https://patchwork.freedesktop.org/patch/584955/?series=131663&rev=1 > --- > drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c | 3 --- > 1 file changed, 3 deletions(-) > > diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c b/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c > index 1f5245fc2cdc..d4e1ebfcb021 100644 > --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c > +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c > @@ -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 >
diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c b/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c index 1f5245fc2cdc..d4e1ebfcb021 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c @@ -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);