From: Sonny Jiang <sonny.jiang@amd.com>
Date: Thu, 21 Jul 2022 17:27:08 +0000 (-0400)
Subject: drm/amdgpu: fix a vcn4 boot poll bug in emulation mode
X-Git-Tag: v6.0-rc1~138^2^2~16
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=736f7308d3e6201322142d98abe4e9af33a429f7;p=thirdparty%2Fkernel%2Flinux.git

drm/amdgpu: fix a vcn4 boot poll bug in emulation mode

The return value should be set in vcn4 boot poll.

Signed-off-by: Sonny Jiang <sonny.jiang@amd.com>
Reviewed-by: James Zhu <James.Zhu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---

diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c
index 0bde38449fd21..ca14c3ef742ec 100644
--- a/drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c
@@ -1041,6 +1041,7 @@ static int vcn_v4_0_start(struct amdgpu_device *adev)
 			}
 
 			if (amdgpu_emu_mode==1) {
+				r = -1;
 				if (status & 2) {
 					r = 0;
 					break;