OSDN Git Service

drm/amdkfd: Use proper enum in pm_unmap_queues_v9()
authorNathan Chancellor <nathan@kernel.org>
Thu, 17 Feb 2022 16:21:42 +0000 (09:21 -0700)
committerAlex Deucher <alexander.deucher@amd.com>
Thu, 17 Feb 2022 20:59:06 +0000 (15:59 -0500)
Clang warns:

  drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_packet_manager_v9.c:267:3:
  error: implicit conversion from enumeration type 'enum
  mes_map_queues_extended_engine_sel_enum' to different enumeration type
  'enum mes_unmap_queues_extended_engine_sel_enum'
  [-Werror,-Wenum-conversion]
                  extended_engine_sel__mes_map_queues__sdma0_to_7_sel :
                  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  1 error generated.

Use 'extended_engine_sel__mes_unmap_queues__sdma0_to_7_sel' to eliminate
the warning, which is the same numeric value of the proper type.

Fixes: 009e9a158505 ("drm/amdkfd: navi2x requires extended engines to map and unmap sdma queues")
Link: https://github.com/ClangBuiltLinux/linux/issues/1596
Signed-off-by: Nathan Chancellor <nathan@kernel.org>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_v9.c

index 806a035..1825084 100644 (file)
@@ -264,7 +264,7 @@ static int pm_unmap_queues_v9(struct packet_manager *pm, uint32_t *buffer,
                                        sizeof(struct pm4_mes_unmap_queues));
 
        packet->bitfields2.extended_engine_sel = pm_use_ext_eng(pm->dqm->dev) ?
-               extended_engine_sel__mes_map_queues__sdma0_to_7_sel :
+               extended_engine_sel__mes_unmap_queues__sdma0_to_7_sel :
                extended_engine_sel__mes_unmap_queues__legacy_engine_sel;
 
        packet->bitfields2.engine_sel =