4.9-stable patches

added patches:
	drm-amdgpu-fix-set-scaling-mode-full-full-aspect-center-not-works-on-vga-and-dvi-connectors.patch
	drm-udl-fix-control-message-timeout.patch

diff --git a/queue-4.9/drm-amdgpu-fix-set-scaling-mode-full-full-aspect-center-not-works-on-vga-and-dvi-connectors.patch b/queue-4.9/drm-amdgpu-fix-set-scaling-mode-full-full-aspect-center-not-works-on-vga-and-dvi-connectors.patch
new file mode 100644 (file)
index 0000000..1625295
--- /dev/null
+++ b/queue-4.9/drm-amdgpu-fix-set-scaling-mode-full-full-aspect-center-not-works-on-vga-and-dvi-connectors.patch
@@ -0,0 +1,38 @@
+From bf552083916a7f8800477b5986940d1c9a31b953 Mon Sep 17 00:00:00 2001
+From: hongao <hongao@uniontech.com>
+Date: Thu, 11 Nov 2021 11:32:07 +0800
+Subject: drm/amdgpu: fix set scaling mode Full/Full aspect/Center not works on vga and dvi connectors
+
+From: hongao <hongao@uniontech.com>
+
+commit bf552083916a7f8800477b5986940d1c9a31b953 upstream.
+
+amdgpu_connector_vga_get_modes missed function amdgpu_get_native_mode
+which assign amdgpu_encoder->native_mode with *preferred_mode result in
+amdgpu_encoder->native_mode.clock always be 0. That will cause
+amdgpu_connector_set_property returned early on:
+if ((rmx_type != DRM_MODE_SCALE_NONE) &&
+       (amdgpu_encoder->native_mode.clock == 0))
+when we try to set scaling mode Full/Full aspect/Center.
+Add the missing function to amdgpu_connector_vga_get_mode can fix this.
+It also works on dvi connectors because
+amdgpu_connector_dvi_helper_funcs.get_mode use the same method.
+
+Signed-off-by: hongao <hongao@uniontech.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+Cc: stable@vger.kernel.org
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c
+@@ -844,6 +844,7 @@ static int amdgpu_connector_vga_get_mode
+ 
+       amdgpu_connector_get_edid(connector);
+       ret = amdgpu_connector_ddc_get_modes(connector);
++      amdgpu_get_native_mode(connector);
+ 
+       return ret;
+ }

diff --git a/queue-4.9/drm-udl-fix-control-message-timeout.patch b/queue-4.9/drm-udl-fix-control-message-timeout.patch
new file mode 100644 (file)
index 0000000..d5e1fa9
--- /dev/null
+++ b/queue-4.9/drm-udl-fix-control-message-timeout.patch
@@ -0,0 +1,33 @@
+From 5591c8f79db1729d9c5ac7f5b4d3a5c26e262d93 Mon Sep 17 00:00:00 2001
+From: Johan Hovold <johan@kernel.org>
+Date: Mon, 25 Oct 2021 13:53:53 +0200
+Subject: drm/udl: fix control-message timeout
+
+From: Johan Hovold <johan@kernel.org>
+
+commit 5591c8f79db1729d9c5ac7f5b4d3a5c26e262d93 upstream.
+
+USB control-message timeouts are specified in milliseconds and should
+specifically not vary with CONFIG_HZ.
+
+Fixes: 5320918b9a87 ("drm/udl: initial UDL driver (v4)")
+Cc: stable@vger.kernel.org      # 3.4
+Signed-off-by: Johan Hovold <johan@kernel.org>
+Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
+Link: https://patchwork.freedesktop.org/patch/msgid/20211025115353.5089-1-johan@kernel.org
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/gpu/drm/udl/udl_connector.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/gpu/drm/udl/udl_connector.c
++++ b/drivers/gpu/drm/udl/udl_connector.c
+@@ -37,7 +37,7 @@ static u8 *udl_get_edid(struct udl_devic
+               ret = usb_control_msg(udl->udev,
+                                     usb_rcvctrlpipe(udl->udev, 0), (0x02),
+                                     (0x80 | (0x02 << 5)), i << 8, 0xA1, rbuf, 2,
+-                                    HZ);
++                                    1000);
+               if (ret < 1) {
+                       DRM_ERROR("Read EDID byte %d failed err %x\n", i, ret);
+                       goto error;

diff --git a/queue-4.9/series b/queue-4.9/series
index 0f7c686552bff27615e6a0596960eecf85b3aacf..646648808706a92f4116e6bf96d33633f067fe49 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -193,3 +193,5 @@ mm-kmemleak-slob-respect-slab_noleaktrace-flag.patch
 btrfs-fix-memory-ordering-between-normal-and-ordered-work-functions.patch
 parisc-sticon-fix-reverse-colors.patch
 cfg80211-call-cfg80211_stop_ap-when-switch-from-p2p_go-type.patch
+drm-udl-fix-control-message-timeout.patch
+drm-amdgpu-fix-set-scaling-mode-full-full-aspect-center-not-works-on-vga-and-dvi-connectors.patch