From: jsg <jsg@openbsd.org>
Date: Thu, 22 Jun 2023 05:07:09 +0000 (+0000)
Subject: drm/amdgpu: vcn_4_0 set instance 0 init sched score to 1
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=96cfa41c8d8b4a052aa2138449e5ac1a888427aa;p=openbsd

drm/amdgpu: vcn_4_0 set instance 0 init sched score to 1

From Sonny Jiang
5d1fdfb3d185a9726478ba174235eff7c16f1101 in linux-6.1.y/6.1.35
9db5ec1ceb5303398ec4f899d691073d531257c3 in mainline linux
---

diff --git a/sys/dev/pci/drm/amd/amdgpu/vcn_v4_0.c b/sys/dev/pci/drm/amd/amdgpu/vcn_v4_0.c
index b8556028725..15408c80420 100644
--- a/sys/dev/pci/drm/amd/amdgpu/vcn_v4_0.c
+++ b/sys/dev/pci/drm/amd/amdgpu/vcn_v4_0.c
@@ -117,7 +117,11 @@ static int vcn_v4_0_sw_init(void *handle)
 		if (adev->vcn.harvest_config & (1 << i))
 			continue;
 
-		atomic_set(&adev->vcn.inst[i].sched_score, 0);
+		/* Init instance 0 sched_score to 1, so it's scheduled after other instances */
+		if (i == 0)
+			atomic_set(&adev->vcn.inst[i].sched_score, 1);
+		else
+			atomic_set(&adev->vcn.inst[i].sched_score, 0);
 
 		/* VCN UNIFIED TRAP */
 		r = amdgpu_irq_add_id(adev, amdgpu_ih_clientid_vcns[i],