6.0-stable patches

added patches:
	net-ethernet-ti-davinci_mdio-fix-build-for-mdio-bitbang-uses.patch
	revert-drm-amd-display-correct-hostvm-flag.patch

diff --git a/queue-6.0/net-ethernet-ti-davinci_mdio-fix-build-for-mdio-bitbang-uses.patch b/queue-6.0/net-ethernet-ti-davinci_mdio-fix-build-for-mdio-bitbang-uses.patch
new file mode 100644 (file)
index 0000000..ad25d63
--- /dev/null
+++ b/queue-6.0/net-ethernet-ti-davinci_mdio-fix-build-for-mdio-bitbang-uses.patch
@@ -0,0 +1,46 @@
+From 35bbe652c421037822aba29423f5f1f7d0d69f3f Mon Sep 17 00:00:00 2001
+From: Randy Dunlap <rdunlap@infradead.org>
+Date: Tue, 23 Aug 2022 19:42:16 -0700
+Subject: net: ethernet: ti: davinci_mdio: fix build for mdio bitbang uses
+
+From: Randy Dunlap <rdunlap@infradead.org>
+
+commit 35bbe652c421037822aba29423f5f1f7d0d69f3f upstream.
+
+davinci_mdio.c uses mdio bitbang APIs, so it should select
+MDIO_BITBANG to prevent build errors.
+
+arm-linux-gnueabi-ld: drivers/net/ethernet/ti/davinci_mdio.o: in function `davinci_mdio_remove':
+drivers/net/ethernet/ti/davinci_mdio.c:649: undefined reference to `free_mdio_bitbang'
+arm-linux-gnueabi-ld: drivers/net/ethernet/ti/davinci_mdio.o: in function `davinci_mdio_probe':
+drivers/net/ethernet/ti/davinci_mdio.c:545: undefined reference to `alloc_mdio_bitbang'
+arm-linux-gnueabi-ld: drivers/net/ethernet/ti/davinci_mdio.o: in function `davinci_mdiobb_read':
+drivers/net/ethernet/ti/davinci_mdio.c:236: undefined reference to `mdiobb_read'
+arm-linux-gnueabi-ld: drivers/net/ethernet/ti/davinci_mdio.o: in function `davinci_mdiobb_write':
+drivers/net/ethernet/ti/davinci_mdio.c:253: undefined reference to `mdiobb_write'
+
+Fixes: d04807b80691 ("net: ethernet: ti: davinci_mdio: Add workaround for errata i2329")
+Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
+Cc: Grygorii Strashko <grygorii.strashko@ti.com>
+Cc: Ravi Gunasekaran <r-gunasekaran@ti.com>
+Cc: Eric Dumazet <edumazet@google.com>
+Cc: Paolo Abeni <pabeni@redhat.com>
+Cc: Naresh Kamboju <naresh.kamboju@linaro.org>
+Cc: Sudip Mukherjee (Codethink) <sudipm.mukherjee@gmail.com>
+Link: https://lore.kernel.org/r/20220824024216.4939-1-rdunlap@infradead.org
+Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/net/ethernet/ti/Kconfig |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/net/ethernet/ti/Kconfig
++++ b/drivers/net/ethernet/ti/Kconfig
+@@ -33,6 +33,7 @@ config TI_DAVINCI_MDIO
+       tristate "TI DaVinci MDIO Support"
+       depends on ARCH_DAVINCI || ARCH_OMAP2PLUS || ARCH_KEYSTONE || ARCH_K3 || COMPILE_TEST
+       select PHYLIB
++      select MDIO_BITBANG
+       help
+         This driver supports TI's DaVinci MDIO module.
+ 

diff --git a/queue-6.0/revert-drm-amd-display-correct-hostvm-flag.patch b/queue-6.0/revert-drm-amd-display-correct-hostvm-flag.patch
new file mode 100644 (file)
index 0000000..f9a022e
--- /dev/null
+++ b/queue-6.0/revert-drm-amd-display-correct-hostvm-flag.patch
@@ -0,0 +1,33 @@
+From 96ab3cb3b0f862308a03046d01d66c7b4154846b Mon Sep 17 00:00:00 2001
+From: Aric Cyr <aric.cyr@amd.com>
+Date: Mon, 19 Sep 2022 17:42:22 -0400
+Subject: Revert "drm/amd/display: correct hostvm flag"
+
+From: Aric Cyr <aric.cyr@amd.com>
+
+commit 96ab3cb3b0f862308a03046d01d66c7b4154846b upstream.
+
+This reverts commit 796d6a37ff5ffaf9f2dc0f3f4bf9f4a1034c00de.
+
+4K144 resolution isn't available on DCN31.
+
+Reviewed-by: Sherry Wang <Yao.Wang1@amd.com>
+Acked-by: Hamza Mahfooz <hamza.mahfooz@amd.com>
+Signed-off-by: Aric Cyr <aric.cyr@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/dcn31/dcn31_resource.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c
++++ b/drivers/gpu/drm/amd/display/dc/dcn31/dcn31_resource.c
+@@ -891,7 +891,7 @@ static const struct dc_debug_options deb
+       .optimize_edp_link_rate = true,
+       .enable_sw_cntl_psr = true,
+       .enable_z9_disable_interface = true, /* Allow support for the PMFW interface for disable Z9*/
+-      .dml_hostvm_override = DML_HOSTVM_NO_OVERRIDE,
++      .dml_hostvm_override = DML_HOSTVM_OVERRIDE_FALSE,
+ };
+ 
+ static const struct dc_debug_options debug_defaults_diags = {

diff --git a/queue-6.0/series b/queue-6.0/series
index 3f25fcbbbccff17dd034df1fa57c9ab7e2c77b82..5e970c7754f5d7dd6e86279f174d751d973fe13d 100644 (file)
--- a/queue-6.0/series
+++ b/queue-6.0/series
@@ -940,3 +940,5 @@ mm-hugetlb-fix-uaf-in-hugetlb_handle_userfault.patch
 net-ieee802154-return-einval-for-unknown-addr-type.patch
 alsa-usb-audio-fix-last-interface-check-for-registration.patch
 blk-wbt-fix-that-rwb-wc-is-always-set-to-1-in-wbt_init.patch
+net-ethernet-ti-davinci_mdio-fix-build-for-mdio-bitbang-uses.patch
+revert-drm-amd-display-correct-hostvm-flag.patch