6.4-stable patches

added patches:
	asoc-amd-vangogh-select-config_snd_amd_acp_config.patch
	drm-amd-display-disable-rco-for-dcn314.patch

diff --git a/queue-6.4/asoc-amd-vangogh-select-config_snd_amd_acp_config.patch b/queue-6.4/asoc-amd-vangogh-select-config_snd_amd_acp_config.patch
new file mode 100644 (file)
index 0000000..b721192
--- /dev/null
+++ b/queue-6.4/asoc-amd-vangogh-select-config_snd_amd_acp_config.patch
@@ -0,0 +1,34 @@
+From 812a05256d673b2b9c5db906775d1e6625ba4787 Mon Sep 17 00:00:00 2001
+From: Arnd Bergmann <arnd@arndb.de>
+Date: Fri, 2 Jun 2023 14:44:39 +0200
+Subject: ASoC: amd: vangogh: select CONFIG_SND_AMD_ACP_CONFIG
+
+From: Arnd Bergmann <arnd@arndb.de>
+
+commit 812a05256d673b2b9c5db906775d1e6625ba4787 upstream.
+
+The vangogh driver just gained a link time dependency that now causes
+randconfig builds to fail:
+
+x86_64-linux-ld: sound/soc/amd/vangogh/pci-acp5x.o: in function `snd_acp5x_probe':
+pci-acp5x.c:(.text+0xbb): undefined reference to `snd_amd_acp_find_config'
+
+Fixes: e89f45edb747e ("ASoC: amd: vangogh: Add check for acp config flags in vangogh platform")
+Signed-off-by: Arnd Bergmann <arnd@arndb.de>
+Link: https://lore.kernel.org/r/20230602124447.863476-1-arnd@kernel.org
+Signed-off-by: Mark Brown <broonie@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ sound/soc/amd/Kconfig |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/sound/soc/amd/Kconfig
++++ b/sound/soc/amd/Kconfig
+@@ -81,6 +81,7 @@ config SND_SOC_AMD_VANGOGH_MACH
+       tristate "AMD Vangogh support for NAU8821 CS35L41"
+       select SND_SOC_NAU8821
+       select SND_SOC_CS35L41_SPI
++      select SND_AMD_ACP_CONFIG
+       depends on SND_SOC_AMD_ACP5x && I2C && SPI_MASTER
+       help
+         This option enables machine driver for Vangogh platform

diff --git a/queue-6.4/drm-amd-display-disable-rco-for-dcn314.patch b/queue-6.4/drm-amd-display-disable-rco-for-dcn314.patch
new file mode 100644 (file)
index 0000000..9725905
--- /dev/null
+++ b/queue-6.4/drm-amd-display-disable-rco-for-dcn314.patch
@@ -0,0 +1,50 @@
+From 85e41f1ed5d94a26fe4e57003c399936d291ed70 Mon Sep 17 00:00:00 2001
+From: Daniel Miess <daniel.miess@amd.com>
+Date: Wed, 7 Jun 2023 11:11:44 -0400
+Subject: drm/amd/display: disable RCO for DCN314
+
+From: Daniel Miess <daniel.miess@amd.com>
+
+commit 85e41f1ed5d94a26fe4e57003c399936d291ed70 upstream.
+
+[Why]
+RCO is causing error messages on some DCN314 systems
+
+[How]
+Force disable RCO for DCN314
+
+Fixes: 17fbdbda9cc8 ("drm/amd/display: Enable dcn314 DPP RCO")
+Reviewed-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com>
+Acked-by: Hamza Mahfooz <hamza.mahfooz@amd.com>
+Signed-off-by: Daniel Miess <daniel.miess@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/gpu/drm/amd/display/dc/dcn314/dcn314_dccg.c     |    2 +-
+ drivers/gpu/drm/amd/display/dc/dcn314/dcn314_resource.c |    4 ++++
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+--- a/drivers/gpu/drm/amd/display/dc/dcn314/dcn314_dccg.c
++++ b/drivers/gpu/drm/amd/display/dc/dcn314/dcn314_dccg.c
+@@ -322,7 +322,7 @@ static void dccg314_dpp_root_clock_contr
+ {
+       struct dcn_dccg *dccg_dcn = TO_DCN_DCCG(dccg);
+ 
+-      if (dccg->dpp_clock_gated[dpp_inst] == clock_on)
++      if (dccg->dpp_clock_gated[dpp_inst] != clock_on)
+               return;
+ 
+       if (clock_on) {
+--- a/drivers/gpu/drm/amd/display/dc/dcn314/dcn314_resource.c
++++ b/drivers/gpu/drm/amd/display/dc/dcn314/dcn314_resource.c
+@@ -1936,6 +1936,10 @@ static bool dcn314_resource_construct(
+               dc->debug = debug_defaults_drv;
+       else
+               dc->debug = debug_defaults_diags;
++
++      /* Disable root clock optimization */
++      dc->debug.root_clock_optimization.u32All = 0;
++
+       // Init the vm_helper
+       if (dc->vm_helper)
+               vm_helper_init(dc->vm_helper, 16);

diff --git a/queue-6.4/series b/queue-6.4/series
index 01896b6529859a832c6def66df733a96e335e86c..6d05ce414bab12de5a7eb299d20dc2dc894cbcde 100644 (file)
--- a/queue-6.4/series
+++ b/queue-6.4/series
@@ -228,3 +228,5 @@ drm-i915-sdvo-fix-panel_type-initialization.patch
 drm-amd-flush-any-delayed-gfxoff-on-suspend-entry.patch
 drm-amdgpu-skip-fence-gfx-interrupts-disable-enable-for-s0ix.patch
 drm-amdgpu-pm-fix-throttle_status-for-other-than-mp1-11.0.7.patch
+asoc-amd-vangogh-select-config_snd_amd_acp_config.patch
+drm-amd-display-disable-rco-for-dcn314.patch