From: jsg <jsg@openbsd.org>
Date: Thu, 7 Oct 2021 03:42:00 +0000 (+0000)
Subject: drm/amdgpu: correct initial cp_hqd_quantum for gfx9
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=2bdcbea8a3790e21cf9a00ae5dbba76f05c37575;p=openbsd

drm/amdgpu: correct initial cp_hqd_quantum for gfx9

From Hawking Zhang
9f382e1edf90ae03be43dbd4976c2a332cd7ce2d in linux 5.10.y/5.10.71
9f52c25f59b504a29dda42d83ac1e24d2af535d4 in mainline linux
---

diff --git a/sys/dev/pci/drm/amd/amdgpu/gfx_v9_0.c b/sys/dev/pci/drm/amd/amdgpu/gfx_v9_0.c
index 2c10b17245c..c32b1f2537b 100644
--- a/sys/dev/pci/drm/amd/amdgpu/gfx_v9_0.c
+++ b/sys/dev/pci/drm/amd/amdgpu/gfx_v9_0.c
@@ -3542,7 +3542,7 @@ static int gfx_v9_0_mqd_init(struct amdgpu_ring *ring)
 
 	/* set static priority for a queue/ring */
 	gfx_v9_0_mqd_set_priority(ring, mqd);
-	mqd->cp_hqd_quantum = RREG32(mmCP_HQD_QUANTUM);
+	mqd->cp_hqd_quantum = RREG32_SOC15(GC, 0, mmCP_HQD_QUANTUM);
 
 	/* map_queues packet doesn't need activate the queue,
 	 * so only kiq need set this field.