Christian König
2020-Dec-01 10:40 UTC
[Nouveau] [PATCH v2 01/20] drm/amdgpu: Fix trailing whitespaces
Reviewed-by: Christian K?nig <christian.koenig at amd.com> on patch #1 and #15. Acked-by: Christian K?nig <christian.koenig at amd.com> on patch #2 and #16. Regards, Christian. Am 01.12.20 um 11:35 schrieb Thomas Zimmermann:> Adhere to kernel coding style. > > Signed-off-by: Thomas Zimmermann <tzimmermann at suse.de> > Acked-by: Alex Deucher <alexander.deucher at amd.com> > Acked-by: Sam Ravnborg <sam at ravnborg.org> > Cc: Alex Deucher <alexander.deucher at amd.com> > Cc: Christian K?nig <christian.koenig at amd.com> > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > index 5f304425c948..da23c0f21311 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c > @@ -4922,8 +4922,8 @@ pci_ers_result_t amdgpu_pci_error_detected(struct pci_dev *pdev, pci_channel_sta > case pci_channel_io_normal: > return PCI_ERS_RESULT_CAN_RECOVER; > /* Fatal error, prepare for slot reset */ > - case pci_channel_io_frozen: > - /* > + case pci_channel_io_frozen: > + /* > * Cancel and wait for all TDRs in progress if failing to > * set adev->in_gpu_reset in amdgpu_device_lock_adev > * > @@ -5014,7 +5014,7 @@ pci_ers_result_t amdgpu_pci_slot_reset(struct pci_dev *pdev) > goto out; > } > > - adev->in_pci_err_recovery = true; > + adev->in_pci_err_recovery = true; > r = amdgpu_device_pre_asic_reset(adev, NULL, &need_full_reset); > adev->in_pci_err_recovery = false; > if (r)
Thomas Zimmermann
2020-Dec-02 07:59 UTC
[Nouveau] [PATCH v2 01/20] drm/amdgpu: Fix trailing whitespaces
Hi Am 01.12.20 um 11:40 schrieb Christian K?nig:> Reviewed-by: Christian K?nig <christian.koenig at amd.com> on patch #1 and > #15. > > Acked-by: Christian K?nig <christian.koenig at amd.com> on patch #2 and #16.Could you add these patches to the AMD tree? Best regards Thomas> > Regards, > Christian. > > Am 01.12.20 um 11:35 schrieb Thomas Zimmermann: >> Adhere to kernel coding style. >> >> Signed-off-by: Thomas Zimmermann <tzimmermann at suse.de> >> Acked-by: Alex Deucher <alexander.deucher at amd.com> >> Acked-by: Sam Ravnborg <sam at ravnborg.org> >> Cc: Alex Deucher <alexander.deucher at amd.com> >> Cc: Christian K?nig <christian.koenig at amd.com> >> --- >> ? drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 6 +++--- >> ? 1 file changed, 3 insertions(+), 3 deletions(-) >> >> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c >> b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c >> index 5f304425c948..da23c0f21311 100644 >> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c >> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c >> @@ -4922,8 +4922,8 @@ pci_ers_result_t >> amdgpu_pci_error_detected(struct pci_dev *pdev, pci_channel_sta >> ????? case pci_channel_io_normal: >> ????????? return PCI_ERS_RESULT_CAN_RECOVER; >> ????? /* Fatal error, prepare for slot reset */ >> -??? case pci_channel_io_frozen: >> -??????? /* >> +??? case pci_channel_io_frozen: >> +??????? /* >> ?????????? * Cancel and wait for all TDRs in progress if failing to >> ?????????? * set? adev->in_gpu_reset in amdgpu_device_lock_adev >> ?????????? * >> @@ -5014,7 +5014,7 @@ pci_ers_result_t amdgpu_pci_slot_reset(struct >> pci_dev *pdev) >> ????????? goto out; >> ????? } >> -??? adev->in_pci_err_recovery = true; >> +??? adev->in_pci_err_recovery = true; >> ????? r = amdgpu_device_pre_asic_reset(adev, NULL, &need_full_reset); >> ????? adev->in_pci_err_recovery = false; >> ????? if (r) >-- Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Maxfeldstr. 5, 90409 N?rnberg, Germany (HRB 36809, AG N?rnberg) Gesch?ftsf?hrer: Felix Imend?rffer -------------- next part -------------- A non-text attachment was scrubbed... Name: OpenPGP_signature Type: application/pgp-signature Size: 840 bytes Desc: OpenPGP digital signature URL: <https://lists.freedesktop.org/archives/nouveau/attachments/20201202/7d790946/attachment.sig>