Commit 8c7442f0 authored by Jingwen Chen's avatar Jingwen Chen Committed by Alex Deucher
Browse files

drm/amd/amdgpu: set disabled vcn to no_schduler 



[Why]
after the reset domain introduced, the sched.ready will be init after
hw_init, which will overwrite the setup in vcn hw_init, and lead to
vcn ib test fail.

[How]
set disabled vcn to no_scheduler

Fixes: 5fd8518d ("drm/amdgpu: Move scheduler init to after XGMI is ready")
Signed-off-by: default avatarJingwen Chen <Jingwen.Chen2@amd.com>
Acked-by: default avatarAndrey Grodzovsky <andrey.grodzovsky@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent d18b8ead

drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c

+2 −0
Original line number Diff line number Diff line
@@ -298,6 +298,7 @@ static int vcn_v3_0_hw_init(void *handle) 
			ring = &adev->vcn.inst[i].ring_dec;

			if (amdgpu_vcn_is_disabled_vcn(adev, VCN_DECODE_RING, i)) {

				ring->sched.ready = false;

				ring->no_scheduler = true;

				dev_info(adev->dev, "ring %s is disabled by hypervisor\n", ring->name);

			} else {

				ring->wptr = 0;
@@ -310,6 +311,7 @@ static int vcn_v3_0_hw_init(void *handle) 
				ring = &adev->vcn.inst[i].ring_enc[j];

				if (amdgpu_vcn_is_disabled_vcn(adev, VCN_ENCODE_RING, i)) {

					ring->sched.ready = false;

					ring->no_scheduler = true;

					dev_info(adev->dev, "ring %s is disabled by hypervisor\n", ring->name);

				} else {

					ring->wptr = 0;