[PATCH 28/64] drm/amdgpu: drive all navi asics from the IP discovery table

[Alex Deucher]

On Mon, Oct 11, 2021 at 1:20 PM Mike Lothian <mike at fireburn.co.uk> wrote:
>
> Hi
>
> This patch breaks things for me on my Green Sardine & Navy Flounder
> system (Asus ROG G513QY)
>
> It doesn't get past post with amdgpu built in, will try as a module

Can you provide the dmesg output in that case?

Alex


>
> Cheers
>
> Mike
>
> On Tue, 28 Sept 2021 at 17:44, Alex Deucher <alexander.deucher at amd.com> wrote:
> >
> > Rather than hardcoding based on asic_type, use the IP
> > discovery table to configure the driver.
> >
> > v2: rebase
> >
> > Reviewed-by: Christian König <christian.koenig at amd.com>
> > Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
> > ---
> >  drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 20 --------------------
> >  1 file changed, 20 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> > index 5e0956b19d69..9c47cc636429 100644
> > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> > @@ -2142,26 +2142,6 @@ static int amdgpu_device_ip_early_init(struct amdgpu_device *adev)
> >                 if (r)
> >                         return r;
> >                 break;
> > -       case  CHIP_NAVI14:
> > -       case  CHIP_NAVI12:
> > -       case  CHIP_SIENNA_CICHLID:
> > -       case  CHIP_NAVY_FLOUNDER:
> > -       case  CHIP_DIMGREY_CAVEFISH:
> > -       case  CHIP_BEIGE_GOBY:
> > -       case CHIP_VANGOGH:
> > -       case CHIP_YELLOW_CARP:
> > -       case CHIP_CYAN_SKILLFISH:
> > -               if (adev->asic_type == CHIP_VANGOGH)
> > -                       adev->family = AMDGPU_FAMILY_VGH;
> > -               else if (adev->asic_type == CHIP_YELLOW_CARP)
> > -                       adev->family = AMDGPU_FAMILY_YC;
> > -               else
> > -                       adev->family = AMDGPU_FAMILY_NV;
> > -
> > -               r = nv_set_ip_blocks(adev);
> > -               if (r)
> > -                       return r;
> > -               break;
> >         default:
> >                 r = amdgpu_discovery_set_ip_blocks(adev);
> >                 if (r)
> > --
> > 2.31.1
> >