kernel: bump 5.15 to 5.15.93

[openwrt/staging/noltari.git] / target / linux / bcm27xx / patches-5.15 / 950-0590-drm-vc4-Move-HDMI-reset-to-pm_resume.patch

diff --git a/target/linux/bcm27xx/patches-5.15/950-0590-drm-vc4-Move-HDMI-reset-to-pm_resume.patch b/target/linux/bcm27xx/patches-5.15/950-0590-drm-vc4-Move-HDMI-reset-to-pm_resume.patch
index c8bd69cae20fd14515a615ac042dcf972b4a854b..25dd5b542756c1a0d616e0f8bfc7cc544cce8e12 100644 (file)
--- a/target/linux/bcm27xx/patches-5.15/950-0590-drm-vc4-Move-HDMI-reset-to-pm_resume.patch
+++ b/target/linux/bcm27xx/patches-5.15/950-0590-drm-vc4-Move-HDMI-reset-to-pm_resume.patch
@@ -22,7 +22,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
 
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
-@@ -2194,7 +2194,6 @@ static int vc4_hdmi_cec_init(struct vc4_
+@@ -2193,7 +2193,6 @@ static int vc4_hdmi_cec_init(struct vc4_
        struct platform_device *pdev = vc4_hdmi->pdev;
        struct device *dev = &pdev->dev;
        unsigned long flags;
@@ -103,30 +103,6 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
        return 0;
  }
  
-@@ -2616,20 +2642,11 @@ static int vc4_hdmi_bind(struct device *
-       if (ret)
-               goto err_put_ddc;
- 
--      /*
--       * We need to have the device powered up at this point to call
--       * our reset hook and for the CEC init.
--       */
--      ret = vc4_hdmi_runtime_resume(dev);
--      if (ret)
--              goto err_put_ddc;
--
--      pm_runtime_get_noresume(dev);
--      pm_runtime_set_active(dev);
-       pm_runtime_enable(dev);
- 
--      if (vc4_hdmi->variant->reset)
--              vc4_hdmi->variant->reset(vc4_hdmi);
-+      ret = pm_runtime_resume_and_get(dev);
-+      if (ret)
-+              goto err_put_ddc;
- 
-       if ((of_device_is_compatible(dev->of_node, "brcm,bcm2711-hdmi0") ||
-            of_device_is_compatible(dev->of_node, "brcm,bcm2711-hdmi1")) &&
 --- a/drivers/gpu/drm/vc4/vc4_hdmi_regs.h
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi_regs.h
 @@ -417,7 +417,7 @@ static inline u32 vc4_hdmi_read(struct v