From: jsg <jsg@openbsd.org>
Date: Sat, 27 Nov 2021 04:26:18 +0000 (+0000)
Subject: drm/amd/display: Update swizzle mode enums
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=d121ed5e0a45f02da262c83171a7f31e4fdf1df9;p=openbsd

drm/amd/display: Update swizzle mode enums

From Alvin Lee
3d68d6ee83144044f610d67304cc194c2af7d0c5 in linux 5.10.y/5.10.82
58065a1e524de30df9a2d8214661d5d7eed0a2d9 in mainline linux
---

diff --git a/sys/dev/pci/drm/amd/display/dc/dcn20/dcn20_resource.c b/sys/dev/pci/drm/amd/display/dc/dcn20/dcn20_resource.c
index 31218165464..53ac8269353 100644
--- a/sys/dev/pci/drm/amd/display/dc/dcn20/dcn20_resource.c
+++ b/sys/dev/pci/drm/amd/display/dc/dcn20/dcn20_resource.c
@@ -1852,7 +1852,9 @@ static void swizzle_to_dml_params(
 	case DC_SW_VAR_D_X:
 		*sw_mode = dm_sw_var_d_x;
 		break;
-
+	case DC_SW_VAR_R_X:
+		*sw_mode = dm_sw_var_r_x;
+		break;
 	default:
 		ASSERT(0); /* Not supported */
 		break;
diff --git a/sys/dev/pci/drm/amd/display/dc/dml/display_mode_enums.h b/sys/dev/pci/drm/amd/display/dc/dml/display_mode_enums.h
index 64f9c735f74..e73cee27572 100644
--- a/sys/dev/pci/drm/amd/display/dc/dml/display_mode_enums.h
+++ b/sys/dev/pci/drm/amd/display/dc/dml/display_mode_enums.h
@@ -80,11 +80,11 @@ enum dm_swizzle_mode {
 	dm_sw_SPARE_13 = 24,
 	dm_sw_64kb_s_x = 25,
 	dm_sw_64kb_d_x = 26,
-	dm_sw_SPARE_14 = 27,
+	dm_sw_64kb_r_x = 27,
 	dm_sw_SPARE_15 = 28,
 	dm_sw_var_s_x = 29,
 	dm_sw_var_d_x = 30,
-	dm_sw_64kb_r_x,
+	dm_sw_var_r_x = 31,
 	dm_sw_gfx7_2d_thin_l_vp,
 	dm_sw_gfx7_2d_thin_gl,
 };