Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/radeon: remove set but not used variable 'size', 'relocs_chunk'

Fixes gcc '-Wunused-but-set-variable' warning:

drivers/gpu/drm/radeon/r600_cs.c: In function r600_cs_track_validate_cb:
drivers/gpu/drm/radeon/r600_cs.c:353:22: warning: variable size set but not used [-Wunused-but-set-variable]
drivers/gpu/drm/radeon/r600_cs.c: In function r600_cs_track_validate_db:
drivers/gpu/drm/radeon/r600_cs.c:520:27: warning: variable size set but not used [-Wunused-but-set-variable]
drivers/gpu/drm/radeon/r600_cs.c: In function r600_dma_cs_next_reloc:
drivers/gpu/drm/radeon/r600_cs.c:2345:26: warning: variable relocs_chunk set but not used [-Wunused-but-set-variable]

The first 'size' is not used since commit f30df2fad0c9 ("drm/radeon/r600:
fix tiling issues in CS checker.")

The second 'size' is introduced by commit 88f50c80748b ("drm/radeon/kms:
add htile support to the cs checker v3"), but never used, so remove it.

'relocs_chunk' is not used since commit 9305ede6afe2 ("radeon/kms:
fix dma relocation checking")

Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: zhengbin <zhengbin13@huawei.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

zhengbin and committed by
Alex Deucher
e9f782dd 5111195a

+2 -6
+2 -6
drivers/gpu/drm/radeon/r600_cs.c
··· 350 350 static int r600_cs_track_validate_cb(struct radeon_cs_parser *p, int i) 351 351 { 352 352 struct r600_cs_track *track = p->track; 353 - u32 slice_tile_max, size, tmp; 353 + u32 slice_tile_max, tmp; 354 354 u32 height, height_align, pitch, pitch_align, depth_align; 355 355 u64 base_offset, base_align; 356 356 struct array_mode_checker array_check; ··· 360 360 /* When resolve is used, the second colorbuffer has always 1 sample. */ 361 361 unsigned nsamples = track->is_resolve && i == 1 ? 1 : track->nsamples; 362 362 363 - size = radeon_bo_size(track->cb_color_bo[i]) - track->cb_color_bo_offset[i]; 364 363 format = G_0280A0_FORMAT(track->cb_color_info[i]); 365 364 if (!r600_fmt_is_valid_color(format)) { 366 365 dev_warn(p->dev, "%s:%d cb invalid format %d for %d (0x%08X)\n", ··· 516 517 static int r600_cs_track_validate_db(struct radeon_cs_parser *p) 517 518 { 518 519 struct r600_cs_track *track = p->track; 519 - u32 nviews, bpe, ntiles, size, slice_tile_max, tmp; 520 + u32 nviews, bpe, ntiles, slice_tile_max, tmp; 520 521 u32 height_align, pitch_align, depth_align; 521 522 u32 pitch = 8192; 522 523 u32 height = 8192; ··· 563 564 } 564 565 ib[track->db_depth_size_idx] = S_028000_SLICE_TILE_MAX(tmp - 1) | (track->db_depth_size & 0x3FF); 565 566 } else { 566 - size = radeon_bo_size(track->db_bo); 567 567 /* pitch in pixels */ 568 568 pitch = (G_028000_PITCH_TILE_MAX(track->db_depth_size) + 1) * 8; 569 569 slice_tile_max = G_028000_SLICE_TILE_MAX(track->db_depth_size) + 1; ··· 2340 2342 int r600_dma_cs_next_reloc(struct radeon_cs_parser *p, 2341 2343 struct radeon_bo_list **cs_reloc) 2342 2344 { 2343 - struct radeon_cs_chunk *relocs_chunk; 2344 2345 unsigned idx; 2345 2346 2346 2347 *cs_reloc = NULL; ··· 2347 2350 DRM_ERROR("No relocation chunk !\n"); 2348 2351 return -EINVAL; 2349 2352 } 2350 - relocs_chunk = p->chunk_relocs; 2351 2353 idx = p->dma_reloc_idx; 2352 2354 if (idx >= p->nrelocs) { 2353 2355 DRM_ERROR("Relocs at %d after relocations chunk end %d !\n",