[PATCH] drm/amd/amdgpu: Increase HWIP_MAX_INSTANCE to 10

Alex Deucher alexdeucher at gmail.com
Thu Sep 2 16:16:10 UTC 2021


Applied.  Thanks!

Alex

On Thu, Sep 2, 2021 at 3:50 AM Ernst Sjöstrand <ernstp at gmail.com> wrote:
>
> Seems like newer cards can have even more instances now.
> Found by UBSAN: array-index-out-of-bounds in
> drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c:318:29
> index 8 is out of range for type 'uint32_t *[8]'
>
> Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1697
> Cc: stable at vger.kernel.org
> Signed-off-by: Ernst Sjöstrand <ernstp at gmail.com>
> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> index dc3c6b3a00e5..d356e329e6f8 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> @@ -758,7 +758,7 @@ enum amd_hw_ip_block_type {
>         MAX_HWIP
>  };
>
> -#define HWIP_MAX_INSTANCE      8
> +#define HWIP_MAX_INSTANCE      10
>
>  struct amd_powerplay {
>         void *pp_handle;
> --
> 2.30.2
>


More information about the amd-gfx mailing list