On Wed, 31 May 2023, Zhenyu Wang <zhenyuw@xxxxxxxxxxxxxxx> wrote:
> On 2023.05.31 02:04:11 +0000, Zhi Wang wrote:
>> Remove unused variable gma_bottom in scan_workload() and scan_wa_ctx().
>> commit be1da7070aea ("drm/i915/gvt: vGPU command scanner") introduces
>> gma_bottom in several functions to calculate the size of the command
>> buffer. However, some of them are set but actually unused.
>>
>> When compiling the code with ccflags -Wunused-but-set-variable, gcc
>> throws warnings.
>>
>> Remove unused variables to avoid the gcc warnings. Tested via compiling
>> the code with ccflags -Wunused-but-set-variable.
>>
>> Fixes: be1da7070aea ("drm/i915/gvt: vGPU command scanner")
>> Suggested-by: Jani Nikula <jani.nikula@xxxxxxxxx>
>> Cc: Zhenyu Wang <zhenyuw@xxxxxxxxxxxxxxx>
>> Cc: intel-gvt-dev@xxxxxxxxxxxxxxxxxxxxx
>> Signed-off-by: Zhi Wang <zhi.a.wang@xxxxxxxxx>
>> ---
>
> Good with me. I think I also caught this before but never send the change..
> Reviewed-by: Zhenyu Wang <zhenyuw@xxxxxxxxxxxxxxx>
I'd like to pick this up via drm-intel-next if that's all right.
BR,
Jani.
>
>> drivers/gpu/drm/i915/gvt/cmd_parser.c | 6 ++----
>> 1 file changed, 2 insertions(+), 4 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/gvt/cmd_parser.c b/drivers/gpu/drm/i915/gvt/cmd_parser.c
>> index 3c4ae1da0d41..05f9348b7a9d 100644
>> --- a/drivers/gpu/drm/i915/gvt/cmd_parser.c
>> +++ b/drivers/gpu/drm/i915/gvt/cmd_parser.c
>> @@ -2833,7 +2833,7 @@ static int command_scan(struct parser_exec_state *s,
>>
>> static int scan_workload(struct intel_vgpu_workload *workload)
>> {
>> - unsigned long gma_head, gma_tail, gma_bottom;
>> + unsigned long gma_head, gma_tail;
>> struct parser_exec_state s;
>> int ret = 0;
>>
>> @@ -2843,7 +2843,6 @@ static int scan_workload(struct intel_vgpu_workload *workload)
>>
>> gma_head = workload->rb_start + workload->rb_head;
>> gma_tail = workload->rb_start + workload->rb_tail;
>> - gma_bottom = workload->rb_start + _RING_CTL_BUF_SIZE(workload->rb_ctl);
>>
>> s.buf_type = RING_BUFFER_INSTRUCTION;
>> s.buf_addr_type = GTT_BUFFER;
>> @@ -2874,7 +2873,7 @@ static int scan_workload(struct intel_vgpu_workload *workload)
>> static int scan_wa_ctx(struct intel_shadow_wa_ctx *wa_ctx)
>> {
>>
>> - unsigned long gma_head, gma_tail, gma_bottom, ring_size, ring_tail;
>> + unsigned long gma_head, gma_tail, ring_size, ring_tail;
>> struct parser_exec_state s;
>> int ret = 0;
>> struct intel_vgpu_workload *workload = container_of(wa_ctx,
>> @@ -2891,7 +2890,6 @@ static int scan_wa_ctx(struct intel_shadow_wa_ctx *wa_ctx)
>> PAGE_SIZE);
>> gma_head = wa_ctx->indirect_ctx.guest_gma;
>> gma_tail = wa_ctx->indirect_ctx.guest_gma + ring_tail;
>> - gma_bottom = wa_ctx->indirect_ctx.guest_gma + ring_size;
>>
>> s.buf_type = RING_BUFFER_INSTRUCTION;
>> s.buf_addr_type = GTT_BUFFER;
>> --
>> 2.25.1
>>
--
Jani Nikula, Intel Open Source Graphics Center
