Nathan just sent out the same patch and I already applied it. Thanks!
Alex
On Thu, Feb 17, 2022 at 11:41 AM <trix@xxxxxxxxxx> wrote:
>
> From: Tom Rix <trix@xxxxxxxxxx>
>
> Clang build fails with
> 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'
> extended_engine_sel__mes_map_queues__sdma0_to_7_sel :
> ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>
> This looks like a typo, the function is _unmap_, the enum
> extended_engine_sel__mes_map_queues__sdma0_to_7_sel is _map_.
> To match the packet->bitfields2.extended_engine_set type
> it should be extended_engine_sel__mes_unmap_queues__sdma0_to_7_sel.
>
> Fixes: 009e9a158505 ("drm/amdkfd: navi2x requires extended engines to map and unmap sdma queues")
> Signed-off-by: Tom Rix <trix@xxxxxxxxxx>
> ---
> drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_v9.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_v9.c b/drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_v9.c
> index 806a03566a24..18250845a989 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_v9.c
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_v9.c
> @@ -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 =
> --
> 2.26.3
>
