Re: [PATCH 09/10] drm/amdgpu: remove unnecessary variables

[Rodrigo Siqueira Jordao]

On 2021-12-07 8:25 p.m., Isabella Basso wrote:

This fixes the warnings below:

  In function 'svm_range_map_to_gpu':
  warning: variable 'bo_va' set but not used [-Wunused-but-set-variable]
  1172 |         struct amdgpu_bo_va bo_va;
       |                             ^~~~~
  ...
  In function 'dcn201_update_clocks':
  warning: variable 'enter_display_off' set but not used 
[-Wunused-but-set-variable]
  132 |         bool enter_display_off = false;
      |              ^~~~~~~~~~~~~~~~~

Signed-off-by: Isabella Basso <isabba...@riseup.net>
---
  drivers/gpu/drm/amd/amdkfd/kfd_svm.c                          | 3 +--
  .../gpu/drm/amd/display/dc/clk_mgr/dcn201/dcn201_clk_mgr.c    | 4 ----
  2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_svm.c 
b/drivers/gpu/drm/amd/amdkfd/kfd_svm.c
index 82cb45e30197..08b2130afa4c 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_svm.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_svm.c
@@ -1169,7 +1169,6 @@ svm_range_map_to_gpu(struct amdgpu_device *adev, struct 
amdgpu_vm *vm,
                     unsigned long npages, bool readonly, dma_addr_t *dma_addr,
                     struct amdgpu_device *bo_adev, struct dma_fence **fence)
  {
-       struct amdgpu_bo_va bo_va;
        bool table_freed = false;
        uint64_t pte_flags;
        unsigned long last_start;
@@ -1183,7 +1182,7 @@ svm_range_map_to_gpu(struct amdgpu_device *adev, struct 
amdgpu_vm *vm,
                 last_start, last_start + npages - 1, readonly);

if (prange->svm_bo && prange->ttm_res)

-               bo_va.is_xgmi = amdgpu_xgmi_same_hive(adev, bo_adev);
+               amdgpu_xgmi_same_hive(adev, bo_adev);

for (i = offset; i < offset + npages; i++) {

                last_domain = dma_addr[i] & SVM_RANGE_VRAM_DOMAIN;
diff --git a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn201/dcn201_clk_mgr.c 
b/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn201/dcn201_clk_mgr.c
index f7f46b886162..2ea813a56edf 100644
--- a/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn201/dcn201_clk_mgr.c
+++ b/drivers/gpu/drm/amd/display/dc/clk_mgr/dcn201/dcn201_clk_mgr.c
@@ -128,7 +128,6 @@ static void dcn201_update_clocks(struct clk_mgr 
*clk_mgr_base,
        int display_count;
        bool update_dppclk = false;
        bool update_dispclk = false;
-       bool enter_display_off = false;
        bool dpp_clock_lowered = false;
        bool force_reset = false;
        bool p_state_change_support;
@@ -146,9 +145,6 @@ static void dcn201_update_clocks(struct clk_mgr 
*clk_mgr_base,

display_count = clk_mgr_helper_get_active_display_cnt(dc, context);

I suspect we can safely drop `display_count` variable.

Thanks
Siqueira

- if (display_count == 0)

-               enter_display_off = true;
-
        if (should_set_clock(safe_to_lower, new_clocks->phyclk_khz, 
clk_mgr_base->clks.phyclk_khz))
                clk_mgr_base->clks.phyclk_khz = new_clocks->phyclk_khz;