From: jsg <jsg@openbsd.org>
Date: Thu, 12 Sep 2024 23:38:36 +0000 (+0000)
Subject: drm/amdgpu: check for LINEAR_ALIGNED correctly in check_tiling_flags_gfx6
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=6b2fcb1b5a440473c73a8f053d40f238e0769d06;p=openbsd

drm/amdgpu: check for LINEAR_ALIGNED correctly in check_tiling_flags_gfx6

From Marek Olsak
9a41def4c48f92d386fdadc332a91c379257aa6a in linux-6.6.y/6.6.51
11317d2963fa79767cd7c6231a00a9d77f2e0f54 in mainline linux
---

diff --git a/sys/dev/pci/drm/amd/amdgpu/amdgpu_display.c b/sys/dev/pci/drm/amd/amdgpu/amdgpu_display.c
index 578aeba49ea..82ad2b01f2e 100644
--- a/sys/dev/pci/drm/amd/amdgpu/amdgpu_display.c
+++ b/sys/dev/pci/drm/amd/amdgpu/amdgpu_display.c
@@ -909,8 +909,7 @@ static int check_tiling_flags_gfx6(struct amdgpu_framebuffer *afb)
 {
 	u64 micro_tile_mode;
 
-	/* Zero swizzle mode means linear */
-	if (AMDGPU_TILING_GET(afb->tiling_flags, SWIZZLE_MODE) == 0)
+	if (AMDGPU_TILING_GET(afb->tiling_flags, ARRAY_MODE) == 1) /* LINEAR_ALIGNED */
 		return 0;
 
 	micro_tile_mode = AMDGPU_TILING_GET(afb->tiling_flags, MICRO_TILE_MODE);