Reviewed-by: Oak Zeng <Oak.Zeng@xxxxxxx> Regards, Oak -----Original Message----- From: Alex Deucher <alexdeucher@xxxxxxxxx> Sent: Tuesday, December 4, 2018 2:01 PM To: amd-gfx list <amd-gfx@xxxxxxxxxxxxxxxxxxxxx>; Zeng, Oak <Oak.Zeng@xxxxxxx> Cc: Deucher, Alexander <Alexander.Deucher@xxxxxxx> Subject: Re: [PATCH] drm/amdgpu/si: fix SI after doorbell rework Ping? On Sun, Dec 2, 2018 at 9:50 PM Alex Deucher <alexdeucher@xxxxxxxxx> wrote: > > SI does not use doorbells, move asic doorbell init later asic check. > > Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=108920 > Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx> > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > index c75badfa5c4c..5a72906fdc6b 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > @@ -515,7 +515,6 @@ void amdgpu_device_pci_config_reset(struct amdgpu_device *adev) > */ > static int amdgpu_device_doorbell_init(struct amdgpu_device *adev) { > - amdgpu_asic_init_doorbell_index(adev); > > /* No doorbell on SI hardware generation */ > if (adev->asic_type < CHIP_BONAIRE) { @@ -529,6 +528,8 @@ > static int amdgpu_device_doorbell_init(struct amdgpu_device *adev) > if (pci_resource_flags(adev->pdev, 2) & IORESOURCE_UNSET) > return -EINVAL; > > + amdgpu_asic_init_doorbell_index(adev); > + > /* doorbell bar mapping */ > adev->doorbell.base = pci_resource_start(adev->pdev, 2); > adev->doorbell.size = pci_resource_len(adev->pdev, 2); > -- > 2.13.6 > _______________________________________________ amd-gfx mailing list amd-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/amd-gfx
