Commit c8cb7e09 authored by Hawking Zhang's avatar Hawking Zhang Committed by Alex Deucher

drm/amdgpu: Query boot status if discovery failed

Check and report boot status if discovery failed.
Signed-off-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: default avatarYang Wang <kevinyang.wang@amd.com>
Reviewed-by: default avatarLe Ma <le.ma@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent cce4febb
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include "amdgpu_discovery.h" #include "amdgpu_discovery.h"
#include "soc15_hw_ip.h" #include "soc15_hw_ip.h"
#include "discovery.h" #include "discovery.h"
#include "amdgpu_ras.h"
#include "soc15.h" #include "soc15.h"
#include "gfx_v9_0.h" #include "gfx_v9_0.h"
...@@ -98,6 +99,7 @@ ...@@ -98,6 +99,7 @@
#define FIRMWARE_IP_DISCOVERY "amdgpu/ip_discovery.bin" #define FIRMWARE_IP_DISCOVERY "amdgpu/ip_discovery.bin"
MODULE_FIRMWARE(FIRMWARE_IP_DISCOVERY); MODULE_FIRMWARE(FIRMWARE_IP_DISCOVERY);
#define mmIP_DISCOVERY_VERSION 0x16A00
#define mmRCC_CONFIG_MEMSIZE 0xde3 #define mmRCC_CONFIG_MEMSIZE 0xde3
#define mmMP0_SMN_C2PMSG_33 0x16061 #define mmMP0_SMN_C2PMSG_33 0x16061
#define mmMM_INDEX 0x0 #define mmMM_INDEX 0x0
...@@ -518,7 +520,9 @@ static int amdgpu_discovery_init(struct amdgpu_device *adev) ...@@ -518,7 +520,9 @@ static int amdgpu_discovery_init(struct amdgpu_device *adev)
out: out:
kfree(adev->mman.discovery_bin); kfree(adev->mman.discovery_bin);
adev->mman.discovery_bin = NULL; adev->mman.discovery_bin = NULL;
if ((amdgpu_discovery != 2) &&
(RREG32(mmIP_DISCOVERY_VERSION) == 4))
amdgpu_ras_query_boot_status(adev, 4);
return r; return r;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment