kernel: bump 5.15 to 5.15.62

[openwrt/openwrt.git] / target / linux / bcm27xx / patches-5.15 / 950-0711-drm-vc4-Rename-bridge-to-out_bridge.patch

diff --git a/target/linux/bcm27xx/patches-5.15/950-0711-drm-vc4-Rename-bridge-to-out_bridge.patch b/target/linux/bcm27xx/patches-5.15/950-0711-drm-vc4-Rename-bridge-to-out_bridge.patch
index 0d14eeccd4514e74e783ef7517266c378323e299..df4aece95e8204198f05e8cdd9ca10e0db33cd02 100644 (file)
--- a/target/linux/bcm27xx/patches-5.15/950-0711-drm-vc4-Rename-bridge-to-out_bridge.patch
+++ b/target/linux/bcm27xx/patches-5.15/950-0711-drm-vc4-Rename-bridge-to-out_bridge.patch
@@ -32,45 +32,25 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
                        break;
        }
  
-@@ -1667,7 +1667,7 @@ static int vc4_dsi_bind(struct device *d
+@@ -1687,9 +1687,9 @@ static int vc4_dsi_bind(struct device *d
+               return ret;
        }
  
-       ret = drm_of_find_panel_or_bridge(dev->of_node, 0, 0,
--                                        &panel, &dsi->bridge);
-+                                        &panel, &dsi->out_bridge);
-       if (ret) {
-               /* If the bridge or panel pointed by dev->of_node is not
-                * enabled, just return 0 here so that we don't prevent the DRM
-@@ -1682,10 +1682,10 @@ static int vc4_dsi_bind(struct device *d
-       }
+-      dsi->bridge = devm_drm_of_get_bridge(dev, dev->of_node, 0, 0);
+-      if (IS_ERR(dsi->bridge))
+-              return PTR_ERR(dsi->bridge);
++      dsi->out_bridge = devm_drm_of_get_bridge(dev, dev->of_node, 0, 0);
++      if (IS_ERR(dsi->out_bridge))
++              return PTR_ERR(dsi->out_bridge);
  
-       if (panel) {
--              dsi->bridge = devm_drm_panel_bridge_add_typed(dev, panel,
--                                                            DRM_MODE_CONNECTOR_DSI);
--              if (IS_ERR(dsi->bridge)) {
--                      ret = PTR_ERR(dsi->bridge);
-+              dsi->out_bridge = devm_drm_panel_bridge_add_typed(dev, panel,
-+                                                                DRM_MODE_CONNECTOR_DSI);
-+              if (IS_ERR(dsi->out_bridge)) {
-+                      ret = PTR_ERR(dsi->out_bridge);
-                       goto err_free_dma;
-               }
-       }
-@@ -1704,7 +1704,7 @@ static int vc4_dsi_bind(struct device *d
+       /* The esc clock rate is supposed to always be 100Mhz. */
+       ret = clk_set_rate(dsi->escape_clock, 100 * 1000000);
+@@ -1705,7 +1705,7 @@ static int vc4_dsi_bind(struct device *d
        drm_simple_encoder_init(drm, dsi->encoder, DRM_MODE_ENCODER_DSI);
        drm_encoder_helper_add(dsi->encoder, &vc4_dsi_encoder_helper_funcs);
  
 -      ret = drm_bridge_attach(dsi->encoder, dsi->bridge, NULL, 0);
 +      ret = drm_bridge_attach(dsi->encoder, dsi->out_bridge, NULL, 0);
-       if (ret) {
-               dev_err(dev, "bridge attach failed: %d\n", ret);
-               goto err_free_dma;
-@@ -1741,7 +1741,7 @@ static void vc4_dsi_unbind(struct device
- {
-       struct vc4_dsi *dsi = dev_get_drvdata(dev);
- 
--      if (dsi->bridge)
-+      if (dsi->out_bridge)
-               pm_runtime_disable(dev);
- 
-       /*
+       if (ret)
+               return ret;
+       /* Disable the atomic helper calls into the bridge.  We