| Message ID | 20200130012435.49822-1-natechancellor@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/amdgpu: Fix implicit enum conversion in gfx_v9_4_ras_error_inject | expand |
On Thu, Jan 30, 2020 at 3:33 AM Nathan Chancellor <natechancellor@gmail.com> wrote: > > Clang warns: > > ../drivers/gpu/drm/amd/amdgpu/gfx_v9_4.c:967:35: warning: implicit > conversion from enumeration type 'enum amdgpu_ras_block' to different > enumeration type 'enum ta_ras_block' [-Wenum-conversion] > block_info.block_id = info->head.block; > ~ ~~~~~~~~~~~^~~~~ > 1 warning generated. > > Use the function added in commit 828cfa29093f ("drm/amdgpu: Fix amdgpu > ras to ta enums conversion") that handles this conversion explicitly. > > Fixes: 4c461d89db4f ("drm/amdgpu: add RAS support for the gfx block of Arcturus") > Link: https://github.com/ClangBuiltLinux/linux/issues/849 > Signed-off-by: Nathan Chancellor <natechancellor@gmail.com> Applied. thanks! Alex > --- > drivers/gpu/drm/amd/amdgpu/gfx_v9_4.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_4.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_4.c > index e19d275f3f7d..f099f13d7f1e 100644 > --- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_4.c > +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_4.c > @@ -964,7 +964,7 @@ int gfx_v9_4_ras_error_inject(struct amdgpu_device *adev, void *inject_if) > if (!amdgpu_ras_is_supported(adev, AMDGPU_RAS_BLOCK__GFX)) > return -EINVAL; > > - block_info.block_id = info->head.block; > + block_info.block_id = amdgpu_ras_block_to_ta(info->head.block); > block_info.sub_block_index = info->head.sub_block_index; > block_info.inject_error_type = amdgpu_ras_error_to_ta(info->head.type); > block_info.address = info->address; > -- > 2.25.0 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_4.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_4.c index e19d275f3f7d..f099f13d7f1e 100644 --- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_4.c +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_4.c @@ -964,7 +964,7 @@ int gfx_v9_4_ras_error_inject(struct amdgpu_device *adev, void *inject_if) if (!amdgpu_ras_is_supported(adev, AMDGPU_RAS_BLOCK__GFX)) return -EINVAL; - block_info.block_id = info->head.block; + block_info.block_id = amdgpu_ras_block_to_ta(info->head.block); block_info.sub_block_index = info->head.sub_block_index; block_info.inject_error_type = amdgpu_ras_error_to_ta(info->head.type); block_info.address = info->address;
Clang warns: ../drivers/gpu/drm/amd/amdgpu/gfx_v9_4.c:967:35: warning: implicit conversion from enumeration type 'enum amdgpu_ras_block' to different enumeration type 'enum ta_ras_block' [-Wenum-conversion] block_info.block_id = info->head.block; ~ ~~~~~~~~~~~^~~~~ 1 warning generated. Use the function added in commit 828cfa29093f ("drm/amdgpu: Fix amdgpu ras to ta enums conversion") that handles this conversion explicitly. Fixes: 4c461d89db4f ("drm/amdgpu: add RAS support for the gfx block of Arcturus") Link: https://github.com/ClangBuiltLinux/linux/issues/849 Signed-off-by: Nathan Chancellor <natechancellor@gmail.com> --- drivers/gpu/drm/amd/amdgpu/gfx_v9_4.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)