[AMD Official Use Only] Ping ---------------------------------------------------------------------- BW Pengju Zhou > -----Original Message----- > From: Peng Ju Zhou <PengJu.Zhou@xxxxxxx> > Sent: Friday, June 25, 2021 2:44 PM > To: amd-gfx@xxxxxxxxxxxxxxxxxxxxx > Cc: Deng, Emily <Emily.Deng@xxxxxxx>; Zhou, Peng Ju > <PengJu.Zhou@xxxxxxx> > Subject: [PATCH v3] drm/amdgpu: Restore msix after FLR > > From: "Emily.Deng" <Emily.Deng@xxxxxxx> > > After FLR, the msix will be cleared, so need to re-enable it. > > Signed-off-by: Emily.Deng <Emily.Deng@xxxxxxx> > Signed-off-by: Peng Ju Zhou <PengJu.Zhou@xxxxxxx> > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 11 +++++++++++ > 1 file changed, 11 insertions(+) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c > b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c > index 90f50561b43a..26e63cb5d8d5 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c > @@ -277,6 +277,16 @@ static bool amdgpu_msi_ok(struct amdgpu_device > *adev) > return true; > } > > +void amdgpu_restore_msix(struct amdgpu_device *adev) { > + u16 ctrl; > + > + pci_read_config_word(adev->pdev, adev->pdev->msix_cap + > PCI_MSIX_FLAGS, &ctrl); > + ctrl &= ~PCI_MSIX_FLAGS_ENABLE; > + pci_write_config_word(adev->pdev, adev->pdev->msix_cap + > PCI_MSIX_FLAGS, ctrl); > + ctrl |= PCI_MSIX_FLAGS_ENABLE; > + pci_write_config_word(adev->pdev, adev->pdev->msix_cap + > +PCI_MSIX_FLAGS, ctrl); } > /** > * amdgpu_irq_init - initialize interrupt handling > * > @@ -558,6 +568,7 @@ void amdgpu_irq_gpu_reset_resume_helper(struct > amdgpu_device *adev) { > int i, j, k; > > + amdgpu_restore_msix(adev); > for (i = 0; i < AMDGPU_IRQ_CLIENTID_MAX; ++i) { > if (!adev->irq.client[i].sources) > continue; > -- > 2.17.1 _______________________________________________ amd-gfx mailing list amd-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/amd-gfx