• Srinivasan Shanmugam's avatar
    drm/amdgpu: Remove duplicate check for *is_queue_unmap in sdma_v7_0_ring_set_wptr · e060c7ba
    Srinivasan Shanmugam authored
    This commit removes a duplicate check for *is_queue_unmap in the
    sdma_v7_0_ring_set_wptr function. The check at line 171 was considered
    dead code because at this point in the code, we already know that
    *is_queue_unmap is false due to the check at line 161.
    
    By removing this unnecessary check, improves the readability of the
    code
    
    Fixes the below:
    	drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c:171 sdma_v7_0_ring_set_wptr()
    	warn: duplicate check '*is_queue_unmap' (previous on line 161)
    
    drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c
        140 static void sdma_v7_0_ring_set_wptr(struct amdgpu_ring *ring)
        141 {
        142         struct amdgpu_device *adev = ring->adev;
        143         uint32_t *wptr_saved;
        144         uint32_t *is_queue_unmap;
        145         uint64_t aggregated_db_index;
        146         uint32_t mqd_size = adev->mqds[AMDGPU_HW_IP_DMA].mqd_size;
        147
        148         DRM_DEBUG("Setting write pointer\n");
        149
        150         if (ring->is_mes_queue) {
        151                 wptr_saved = (uint32_t *)(ring->mqd_ptr + mqd_size);
        152                 is_queue_unmap = (uint32_t *)(ring->mqd_ptr + mqd_size +
                            ^^^^^^^^^^^^^^^^ Set here
    
        153                                               sizeof(uint32_t));
        154                 aggregated_db_index =
        155                         amdgpu_mes_get_aggregated_doorbell_index(adev,
        156                                                          ring->hw_prio);
        157
        158                 atomic64_set((atomic64_t *)ring->wptr_cpu_addr,
        159                              ring->wptr << 2);
        160                 *wptr_saved = ring->wptr << 2;
        161                 if (*is_queue_unmap) {
                                ^^^^^^^^^^^^^^^ Checked here
    
        162                         WDOORBELL64(aggregated_db_index, ring->wptr << 2);
        163                         DRM_DEBUG("calling WDOORBELL64(0x%08x, 0x%016llx)\n",
        164                                         ring->doorbell_index, ring->wptr << 2);
        165                         WDOORBELL64(ring->doorbell_index, ring->wptr << 2);
        166                 } else {
        167                         DRM_DEBUG("calling WDOORBELL64(0x%08x, 0x%016llx)\n",
        168                                         ring->doorbell_index, ring->wptr << 2);
        169                         WDOORBELL64(ring->doorbell_index, ring->wptr << 2);
        170
    --> 171                         if (*is_queue_unmap)
                                        ^^^^^^^^^^^^^^^ This is dead code.  We know it's false.
    
        172                                 WDOORBELL64(aggregated_db_index,
        173                                             ring->wptr << 2);
        174                 }
        175         } else {
        176                 if (ring->use_doorbell) {
        177                         DRM_DEBUG("Using doorbell -- "
        178                                   "wptr_offs == 0x%08x "
    
    Fixes: b412351e ("drm/amdgpu: Add sdma v7_0 ip block support (v7)")
    Cc: Likun Gao <Likun.Gao@amd.com>
    Cc: Hawking Zhang <Hawking.Zhang@amd.com>
    Cc: Christian König <christian.koenig@amd.com>
    Cc: Alex Deucher <alexander.deucher@amd.com>
    Reported-by: default avatarDan Carpenter <dan.carpenter@linaro.org>
    Signed-off-by: default avatarSrinivasan Shanmugam <srinivasan.shanmugam@amd.com>
    Reviewed-by: default avatarLikun Gao <Likun.Gao@amd.com>
    Reviewed-by: default avatarAsad Kamal <asad.kamal@amd.com>
    Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
    e060c7ba
sdma_v7_0.c 49.5 KB