diff options
author | Álvaro Fernández Rojas <noltari@gmail.com> | 2022-05-16 23:40:32 +0200 |
---|---|---|
committer | Álvaro Fernández Rojas <noltari@gmail.com> | 2022-05-17 15:11:22 +0200 |
commit | 20ea6adbf199097c4f5f591ffee088340630dae4 (patch) | |
tree | d6719d95e136611a1c25bbf7789652d6d402779d /target/linux/bcm27xx/patches-5.15/950-0711-drm-vc4-Rename-bridge-to-out_bridge.patch | |
parent | bca05bd072180dc38ef740b37ded9572a6db1981 (diff) | |
download | upstream-20ea6adbf199097c4f5f591ffee088340630dae4.tar.gz upstream-20ea6adbf199097c4f5f591ffee088340630dae4.tar.bz2 upstream-20ea6adbf199097c4f5f591ffee088340630dae4.zip |
bcm27xx: add support for linux v5.15
Build system: x86_64
Build-tested: bcm2708, bcm2709, bcm2710, bcm2711
Run-tested: bcm2708/RPiB+, bcm2709/RPi3B, bcm2710/RPi3B, bcm2711/RPi4B
Signed-off-by: Marty Jones <mj8263788@gmail.com>
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux/bcm27xx/patches-5.15/950-0711-drm-vc4-Rename-bridge-to-out_bridge.patch')
-rw-r--r-- | target/linux/bcm27xx/patches-5.15/950-0711-drm-vc4-Rename-bridge-to-out_bridge.patch | 76 |
1 files changed, 76 insertions, 0 deletions
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 new file mode 100644 index 0000000000..0d14eeccd4 --- /dev/null +++ b/target/linux/bcm27xx/patches-5.15/950-0711-drm-vc4-Rename-bridge-to-out_bridge.patch @@ -0,0 +1,76 @@ +From 9e26092eb098dec04ece28c05f859bc4add249c0 Mon Sep 17 00:00:00 2001 +From: Dave Stevenson <dave.stevenson@raspberrypi.com> +Date: Thu, 30 Sep 2021 17:51:16 +0100 +Subject: [PATCH] drm/vc4: Rename bridge to out_bridge + +In preparation for converting the encoder to being a bridge, +rename the variable holding the next bridge in the chain to +out_bridge, so that our bridge can be called bridge. + +Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> +--- + drivers/gpu/drm/vc4/vc4_dsi.c | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +--- a/drivers/gpu/drm/vc4/vc4_dsi.c ++++ b/drivers/gpu/drm/vc4/vc4_dsi.c +@@ -553,7 +553,7 @@ struct vc4_dsi { + + struct mipi_dsi_host dsi_host; + struct drm_encoder *encoder; +- struct drm_bridge *bridge; ++ struct drm_bridge *out_bridge; + struct list_head bridge_chain; + + void __iomem *regs; +@@ -804,7 +804,7 @@ static void vc4_dsi_encoder_disable(stru + if (iter->funcs->disable) + iter->funcs->disable(iter); + +- if (iter == dsi->bridge) ++ if (iter == dsi->out_bridge) + break; + } + +@@ -1667,7 +1667,7 @@ static int vc4_dsi_bind(struct device *d + } + + 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 + } + + 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 + 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); + + /* |