From: Alex Deucher <alexander.deucher@amd.com>
Date: Fri, 28 Aug 2020 15:42:44 +0000 (-0400)
Subject: drm/amdgpu: IP discovery table is not ready yet for VG
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=8bb3aa1a833f316374d5331005d7d7d2c648c0ac;p=linux.git

drm/amdgpu: IP discovery table is not ready yet for VG

Fallback to legacy path for now.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---

diff --git a/drivers/gpu/drm/amd/amdgpu/nv.c b/drivers/gpu/drm/amd/amdgpu/nv.c
index fa72f940ea795..6ca5888dcf2fb 100644
--- a/drivers/gpu/drm/amd/amdgpu/nv.c
+++ b/drivers/gpu/drm/amd/amdgpu/nv.c
@@ -449,6 +449,10 @@ static int nv_reg_base_init(struct amdgpu_device *adev)
 {
 	int r;
 
+	/* IP discovery table is not available yet */
+	if (adev->asic_type == CHIP_VANGOGH)
+		goto legacy_init;
+
 	if (amdgpu_discovery) {
 		r = amdgpu_discovery_reg_base_init(adev);
 		if (r) {