bcm27xx: import latest patches from the RPi foundation

[openwrt/openwrt.git] / target / linux / bcm27xx / patches-5.4 / 950-0710-vc4_hdmi-Fix-register-offset-when-sending-longer-CEC.patch

diff --git a/target/linux/bcm27xx/patches-5.4/950-0710-vc4_hdmi-Fix-register-offset-when-sending-longer-CEC.patch b/target/linux/bcm27xx/patches-5.4/950-0710-vc4_hdmi-Fix-register-offset-when-sending-longer-CEC.patch
deleted file mode 100644 (file)
index d192565..0000000
--- a/target/linux/bcm27xx/patches-5.4/950-0710-vc4_hdmi-Fix-register-offset-when-sending-longer-CEC.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 602ec343e69479dbec368f67d09c9f3e3e5ac248 Mon Sep 17 00:00:00 2001
-From: Dom Cobley <popcornmix@gmail.com>
-Date: Thu, 7 May 2020 18:16:07 +0100
-Subject: [PATCH] vc4_hdmi: Fix register offset when sending longer CEC
- messages
-
-Signed-off-by: Dom Cobley <popcornmix@gmail.com>
----
- drivers/gpu/drm/vc4/vc4_hdmi.c | 13 +++++++++++--
- 1 file changed, 11 insertions(+), 2 deletions(-)
-
---- a/drivers/gpu/drm/vc4/vc4_hdmi.c
-+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
-@@ -1265,8 +1265,13 @@ static void vc4_cec_read_msg(struct vc4_
- 
-       msg->len = 1 + ((cntrl1 & VC4_HDMI_CEC_REC_WRD_CNT_MASK) >>
-                                       VC4_HDMI_CEC_REC_WRD_CNT_SHIFT);
-+
-+      if (msg->len > 16) {
-+              DRM_ERROR("Attempting to read too much data (%d)\n", msg->len);
-+              return;
-+      }
-       for (i = 0; i < msg->len; i += 4) {
--              u32 val = HDMI_READ(HDMI_CEC_RX_DATA_1 + i);
-+              u32 val = HDMI_READ(HDMI_CEC_RX_DATA_1 + (i>>2));
- 
-               msg->msg[i] = val & 0xff;
-               msg->msg[i + 1] = (val >> 8) & 0xff;
-@@ -1362,8 +1367,12 @@ static int vc4_hdmi_cec_adap_transmit(st
-       u32 val;
-       unsigned int i;
- 
-+      if (msg->len > 16) {
-+              DRM_ERROR("Attempting to transmit too much data (%d)\n", msg->len);
-+              return -ENOMEM;
-+      }
-       for (i = 0; i < msg->len; i += 4)
--              HDMI_WRITE(HDMI_CEC_TX_DATA_1 + i,
-+              HDMI_WRITE(HDMI_CEC_TX_DATA_1 + (i>>2),
-                          (msg->msg[i]) |
-                          (msg->msg[i + 1] << 8) |
-                          (msg->msg[i + 2] << 16) |