kernel: bump 5.10 to 5.10.94

[openwrt/staging/chunkeey.git] / target / linux / bcm27xx / patches-5.10 / 950-0676-drm-vc4-hdmi-Drop-devm-interrupt-handler-for-hotplug.patch

diff --git a/target/linux/bcm27xx/patches-5.10/950-0676-drm-vc4-hdmi-Drop-devm-interrupt-handler-for-hotplug.patch b/target/linux/bcm27xx/patches-5.10/950-0676-drm-vc4-hdmi-Drop-devm-interrupt-handler-for-hotplug.patch
index 0594e35dbeedef485bca4d0f98bd706509ef5e22..062804814cb40855629b31d840618a4e0a4e83d7 100644 (file)
--- a/target/linux/bcm27xx/patches-5.10/950-0676-drm-vc4-hdmi-Drop-devm-interrupt-handler-for-hotplug.patch
+++ b/target/linux/bcm27xx/patches-5.10/950-0676-drm-vc4-hdmi-Drop-devm-interrupt-handler-for-hotplug.patch
@@ -25,7 +25,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
 
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
-@@ -1611,26 +1611,28 @@ static irqreturn_t vc4_hdmi_hpd_irq_thre
+@@ -1612,26 +1612,28 @@ static irqreturn_t vc4_hdmi_hpd_irq_thre
  static int vc4_hdmi_hotplug_init(struct vc4_hdmi *vc4_hdmi)
  {
        struct platform_device *pdev = vc4_hdmi->pdev;
@@ -66,7 +66,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  
                connector->polled = DRM_CONNECTOR_POLL_HPD;
        }
-@@ -1638,6 +1640,16 @@ static int vc4_hdmi_hotplug_init(struct
+@@ -1639,6 +1641,16 @@ static int vc4_hdmi_hotplug_init(struct
        return 0;
  }
  
@@ -83,7 +83,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  #ifdef CONFIG_DRM_VC4_HDMI_CEC
  static irqreturn_t vc4_cec_irq_handler_rx_thread(int irq, void *priv)
  {
-@@ -2299,7 +2311,7 @@ static int vc4_hdmi_bind(struct device *
+@@ -2314,7 +2326,7 @@ static int vc4_hdmi_bind(struct device *
  
        ret = vc4_hdmi_cec_init(vc4_hdmi);
        if (ret)
@@ -92,7 +92,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  
        ret = vc4_hdmi_audio_init(vc4_hdmi);
        if (ret)
-@@ -2313,6 +2325,8 @@ static int vc4_hdmi_bind(struct device *
+@@ -2328,6 +2340,8 @@ static int vc4_hdmi_bind(struct device *
  
  err_free_cec:
        vc4_hdmi_cec_exit(vc4_hdmi);
@@ -101,7 +101,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  err_destroy_conn:
        vc4_hdmi_connector_destroy(&vc4_hdmi->connector);
  err_destroy_encoder:
-@@ -2354,6 +2368,7 @@ static void vc4_hdmi_unbind(struct devic
+@@ -2369,6 +2383,7 @@ static void vc4_hdmi_unbind(struct devic
        kfree(vc4_hdmi->hd_regset.regs);
  
        vc4_hdmi_cec_exit(vc4_hdmi);