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: 5fd8518d187ed0 ("drm/amdgpu: Move scheduler init to after XGMI is ready")
Signed-off-by: Jingwen Chen <Jingwen.Chen2@amd.com>
Acked-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c
index 530e4deae9c80d8c1cbdc8ffed87d35e4e80ab58..42f943d2d6ce8d5ab4e9406af442a9bfdcf0dc9e 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c
@@ -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;