Re: [PATCH 2/5] drm/amdgpu/psp: Enable mode 0 reset for XGMI.

2018-11-21 Thread Alex Deucher
On Wed, Nov 21, 2018 at 1:10 PM Andrey Grodzovsky
 wrote:
>
> In case of active XGMI hive do mode 0 reset as requsted
> by design.
>
> Signed-off-by: Andrey Grodzovsky 

I think we can drop this patch for now as well.  Maybe just add a
comment here about xgmi.

Alex

> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 6 +-
>  1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c 
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> index e05dc66..befee12 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> @@ -733,7 +733,11 @@ int psp_gpu_reset(struct amdgpu_device *adev)
> if (adev->firmware.load_type != AMDGPU_FW_LOAD_PSP)
> return 0;
>
> -   return psp_mode1_reset(&adev->psp);
> +
> +   if (adev->gmc.xgmi.num_physical_nodes > 1)
> +   return psp_mode0_reset(&adev->psp);
> +   else
> +   return psp_mode1_reset(&adev->psp);
>  }
>
>  static bool psp_check_fw_loading_status(struct amdgpu_device *adev,
> --
> 2.7.4
>
> ___
> amd-gfx mailing list
> amd-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
___
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx


[PATCH 2/5] drm/amdgpu/psp: Enable mode 0 reset for XGMI.

2018-11-21 Thread Andrey Grodzovsky
In case of active XGMI hive do mode 0 reset as requsted
by design.

Signed-off-by: Andrey Grodzovsky 
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
index e05dc66..befee12 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
@@ -733,7 +733,11 @@ int psp_gpu_reset(struct amdgpu_device *adev)
if (adev->firmware.load_type != AMDGPU_FW_LOAD_PSP)
return 0;
 
-   return psp_mode1_reset(&adev->psp);
+
+   if (adev->gmc.xgmi.num_physical_nodes > 1)
+   return psp_mode0_reset(&adev->psp);
+   else
+   return psp_mode1_reset(&adev->psp);
 }
 
 static bool psp_check_fw_loading_status(struct amdgpu_device *adev,
-- 
2.7.4

___
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx