From: Greg Kroah-Hartman Date: Sat, 11 Apr 2020 11:50:47 +0000 (+0200) Subject: 4.4-stable patches X-Git-Tag: v4.4.219~10 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9faf702b434c3b78ac76ae537eef30e092e38b85;p=thirdparty%2Fkernel%2Fstable-queue.git 4.4-stable patches added patches: clk-qcom-rcg-return-failure-for-rcg-update.patch drm_dp_mst_topology-fix-broken-drm_dp_sideband_parse_remote_dpcd_read.patch --- diff --git a/queue-4.4/clk-qcom-rcg-return-failure-for-rcg-update.patch b/queue-4.4/clk-qcom-rcg-return-failure-for-rcg-update.patch new file mode 100644 index 00000000000..1c128d1199c --- /dev/null +++ b/queue-4.4/clk-qcom-rcg-return-failure-for-rcg-update.patch @@ -0,0 +1,33 @@ +From 21ea4b62e1f3dc258001a68da98c9663a9dbd6c7 Mon Sep 17 00:00:00 2001 +From: Taniya Das +Date: Wed, 8 May 2019 23:54:53 +0530 +Subject: clk: qcom: rcg: Return failure for RCG update + +From: Taniya Das + +commit 21ea4b62e1f3dc258001a68da98c9663a9dbd6c7 upstream. + +In case of update config failure, return -EBUSY, so that consumers could +handle the failure gracefully. + +Signed-off-by: Taniya Das +Link: https://lkml.kernel.org/r/1557339895-21952-2-git-send-email-tdas@codeaurora.org +Signed-off-by: Stephen Boyd +Signed-off-by: Lee Jones +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/clk/qcom/clk-rcg2.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/clk/qcom/clk-rcg2.c ++++ b/drivers/clk/qcom/clk-rcg2.c +@@ -107,7 +107,7 @@ static int update_config(struct clk_rcg2 + } + + WARN(1, "%s: rcg didn't update its configuration.", name); +- return 0; ++ return -EBUSY; + } + + static int clk_rcg2_set_parent(struct clk_hw *hw, u8 index) diff --git a/queue-4.4/drm_dp_mst_topology-fix-broken-drm_dp_sideband_parse_remote_dpcd_read.patch b/queue-4.4/drm_dp_mst_topology-fix-broken-drm_dp_sideband_parse_remote_dpcd_read.patch new file mode 100644 index 00000000000..9e86400a4e1 --- /dev/null +++ b/queue-4.4/drm_dp_mst_topology-fix-broken-drm_dp_sideband_parse_remote_dpcd_read.patch @@ -0,0 +1,36 @@ +From a4c30a4861c54af78c4eb8b7855524c1a96d9f80 Mon Sep 17 00:00:00 2001 +From: Hans Verkuil +Date: Mon, 27 Aug 2018 10:07:42 +0200 +Subject: drm_dp_mst_topology: fix broken drm_dp_sideband_parse_remote_dpcd_read() + +From: Hans Verkuil + +commit a4c30a4861c54af78c4eb8b7855524c1a96d9f80 upstream. + +When parsing the reply of a DP_REMOTE_DPCD_READ DPCD command the +result is wrong due to a missing idx increment. + +This was never noticed since DP_REMOTE_DPCD_READ is currently not +used, but if you enable it, then it is all wrong. + +Signed-off-by: Hans Verkuil +Reviewed-by: Lyude Paul +Acked-by: Alex Deucher +Link: https://patchwork.freedesktop.org/patch/msgid/e72ddac2-1dc0-100a-d816-9ac98ac009dd@xs4all.nl +Signed-off-by: Lee Jones +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/gpu/drm/drm_dp_mst_topology.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/gpu/drm/drm_dp_mst_topology.c ++++ b/drivers/gpu/drm/drm_dp_mst_topology.c +@@ -431,6 +431,7 @@ static bool drm_dp_sideband_parse_remote + if (idx > raw->curlen) + goto fail_len; + repmsg->u.remote_dpcd_read_ack.num_bytes = raw->msg[idx]; ++ idx++; + if (idx > raw->curlen) + goto fail_len; + diff --git a/queue-4.4/series b/queue-4.4/series index 61c28302c41..d5196cd1605 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -25,3 +25,5 @@ asoc-jz4740-i2s-fix-divider-written-at-incorrect-offset-in-register.patch ib-hfi1-call-kobject_put-when-kobject_init_and_add-fails.patch bluetooth-rfcomm-fix-odebug-bug-in-rfcomm_dev_ioctl.patch rdma-cm-update-num_paths-in-cma_resolve_iboe_route-error-flow.patch +clk-qcom-rcg-return-failure-for-rcg-update.patch +drm_dp_mst_topology-fix-broken-drm_dp_sideband_parse_remote_dpcd_read.patch