Reviewed-by: Andrey Grodzovsky <andrey.grodzovsky@xxxxxxx>
Andrey
On 5/15/19 4:29 PM, Alex Deucher wrote:
> [CAUTION: External Email]
>
> If RAS or XGMI are enabled, you have to use mode1 reset rather
> than BACO.
>
> Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx>
> ---
> drivers/gpu/drm/amd/amdgpu/soc15.c | 9 +++++++++
> 1 file changed, 9 insertions(+)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c
> index 16c747f838ee..cf63b4dada4b 100644
> --- a/drivers/gpu/drm/amd/amdgpu/soc15.c
> +++ b/drivers/gpu/drm/amd/amdgpu/soc15.c
> @@ -65,6 +65,8 @@
> #include "dce_virtual.h"
> #include "mxgpu_ai.h"
> #include "amdgpu_smu.h"
> +#include "amdgpu_ras.h"
> +#include "amdgpu_xgmi.h"
> #include <uapi/linux/kfd_ioctl.h>
>
> #define mmMP0_MISC_CGTT_CTRL0 0x01b9
> @@ -476,6 +478,13 @@ static int soc15_asic_reset(struct amdgpu_device *adev)
> soc15_asic_get_baco_capability(adev, &baco_reset);
> else
> baco_reset = false;
> + if (baco_reset) {
> + struct amdgpu_hive_info *hive = amdgpu_get_xgmi_hive(adev, 0);
> + struct amdgpu_ras *ras = amdgpu_ras_get_context(adev);
> +
> + if (hive || (ras && ras->supported))
> + baco_reset = false;
> + }
> break;
> default:
> baco_reset = false;
> --
> 2.20.1
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@xxxxxxxxxxxxxxxxxxxxx
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
amd-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
