[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <CADnq5_Mhxr87tT+zT4absJrygQtsUXzwkQAR__ffwCpGCLERBw@mail.gmail.com>
Date: Thu, 16 Oct 2025 11:14:20 -0400
From: Alex Deucher <alexdeucher@...il.com>
To: Tiezhu Yang <yangtiezhu@...ngson.cn>
Cc: Alex Deucher <alexander.deucher@....com>,
Christian König <christian.koenig@....com>,
Harry Wentland <harry.wentland@....com>, Leo Li <sunpeng.li@....com>,
amd-gfx@...ts.freedesktop.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH v1] drm/amd: Fix set but not used warnings
Applied. Thanks!
Alex
On Thu, Oct 16, 2025 at 3:06 AM Tiezhu Yang <yangtiezhu@...ngson.cn> wrote:
>
> There are many set but not used warnings under drivers/gpu/drm/amd when
> compiling with the latest upstream mainline GCC:
>
> drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c:305:18: warning: variable ‘p’ set but not used [-Wunused-but-set-variable=]
> drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h:103:26: warning: variable ‘internal_reg_offset’ set but not used [-Wunused-but-set-variable=]
> ...
> drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h:164:26: warning: variable ‘internal_reg_offset’ set but not used [-Wunused-but-set-variable=]
> ...
> drivers/gpu/drm/amd/amdgpu/../display/dc/dc_dmub_srv.c:445:13: warning: variable ‘pipe_idx’ set but not used [-Wunused-but-set-variable=]
> drivers/gpu/drm/amd/amdgpu/../display/dc/dc_dmub_srv.c:875:21: warning: variable ‘pipe_idx’ set but not used [-Wunused-but-set-variable=]
>
> Remove the variables actually not used or add __maybe_unused attribute for
> the variables actually used to fix them, compile tested only.
>
> Signed-off-by: Tiezhu Yang <yangtiezhu@...ngson.cn>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 4 +---
> drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 6 ++++--
> drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 9 +++------
> 3 files changed, 8 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c
> index b2033f8352f5..83f3b94ed975 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c
> @@ -302,7 +302,6 @@ void amdgpu_gart_unbind(struct amdgpu_device *adev, uint64_t offset,
> int pages)
> {
> unsigned t;
> - unsigned p;
> int i, j;
> u64 page_base;
> /* Starting from VEGA10, system bit must be 0 to mean invalid. */
> @@ -316,8 +315,7 @@ void amdgpu_gart_unbind(struct amdgpu_device *adev, uint64_t offset,
> return;
>
> t = offset / AMDGPU_GPU_PAGE_SIZE;
> - p = t / AMDGPU_GPU_PAGES_IN_CPU_PAGE;
> - for (i = 0; i < pages; i++, p++) {
> + for (i = 0; i < pages; i++) {
> page_base = adev->dummy_page_addr;
> if (!adev->gart.ptr)
> continue;
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h
> index dc8a17bcc3c8..82624b44e661 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h
> @@ -100,7 +100,8 @@
>
> #define SOC15_DPG_MODE_OFFSET(ip, inst_idx, reg) \
> ({ \
> - uint32_t internal_reg_offset, addr; \
> + /* To avoid a -Wunused-but-set-variable warning. */ \
> + uint32_t internal_reg_offset __maybe_unused, addr; \
> bool video_range, video1_range, aon_range, aon1_range; \
> \
> addr = (adev->reg_offset[ip##_HWIP][inst_idx][reg##_BASE_IDX] + reg); \
> @@ -161,7 +162,8 @@
>
> #define SOC24_DPG_MODE_OFFSET(ip, inst_idx, reg) \
> ({ \
> - uint32_t internal_reg_offset, addr; \
> + /* To avoid a -Wunused-but-set-variable warning. */ \
> + uint32_t internal_reg_offset __maybe_unused, addr; \
> bool video_range, video1_range, aon_range, aon1_range; \
> \
> addr = (adev->reg_offset[ip##_HWIP][inst_idx][reg##_BASE_IDX] + reg); \
> diff --git a/drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c b/drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c
> index 53a088ebddef..6518d5639d66 100644
> --- a/drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c
> +++ b/drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c
> @@ -442,7 +442,6 @@ bool dc_dmub_srv_p_state_delegate(struct dc *dc, bool should_manage_pstate, stru
> int i = 0, k = 0;
> int ramp_up_num_steps = 1; // TODO: Ramp is currently disabled. Reenable it.
> uint8_t visual_confirm_enabled;
> - int pipe_idx = 0;
> struct dc_stream_status *stream_status = NULL;
>
> if (dc == NULL)
> @@ -457,7 +456,7 @@ bool dc_dmub_srv_p_state_delegate(struct dc *dc, bool should_manage_pstate, stru
> cmd.fw_assisted_mclk_switch.config_data.visual_confirm_enabled = visual_confirm_enabled;
>
> if (should_manage_pstate) {
> - for (i = 0, pipe_idx = 0; i < dc->res_pool->pipe_count; i++) {
> + for (i = 0; i < dc->res_pool->pipe_count; i++) {
> struct pipe_ctx *pipe = &context->res_ctx.pipe_ctx[i];
>
> if (!pipe->stream)
> @@ -472,7 +471,6 @@ bool dc_dmub_srv_p_state_delegate(struct dc *dc, bool should_manage_pstate, stru
> cmd.fw_assisted_mclk_switch.config_data.vactive_stretch_margin_us = dc->debug.fpo_vactive_margin_us;
> break;
> }
> - pipe_idx++;
> }
> }
>
> @@ -872,7 +870,7 @@ void dc_dmub_setup_subvp_dmub_command(struct dc *dc,
> bool enable)
> {
> uint8_t cmd_pipe_index = 0;
> - uint32_t i, pipe_idx;
> + uint32_t i;
> uint8_t subvp_count = 0;
> union dmub_rb_cmd cmd;
> struct pipe_ctx *subvp_pipes[2];
> @@ -899,7 +897,7 @@ void dc_dmub_setup_subvp_dmub_command(struct dc *dc,
>
> if (enable) {
> // For each pipe that is a "main" SUBVP pipe, fill in pipe data for DMUB SUBVP cmd
> - for (i = 0, pipe_idx = 0; i < dc->res_pool->pipe_count; i++) {
> + for (i = 0; i < dc->res_pool->pipe_count; i++) {
> struct pipe_ctx *pipe = &context->res_ctx.pipe_ctx[i];
> pipe_mall_type = dc_state_get_pipe_subvp_type(context, pipe);
>
> @@ -922,7 +920,6 @@ void dc_dmub_setup_subvp_dmub_command(struct dc *dc,
> populate_subvp_cmd_vblank_pipe_info(dc, context, &cmd, pipe, cmd_pipe_index++);
>
> }
> - pipe_idx++;
> }
> if (subvp_count == 2) {
> update_subvp_prefetch_end_to_mall_start(dc, context, &cmd, subvp_pipes);
> --
> 2.42.0
>
Powered by blists - more mailing lists