iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/vc4: dsi: Rename bridge to out_bridge

Browse Source 
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>
Link: https://lore.kernel.org/r/20221207-rpi-dsi-bridge-v1-1-8f68ee0b0adb@cerno.tech
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
This commit is contained in:
Dave Stevenson 2022-12-07 11:22:44 +01:00 committed by Maxime Ripard
parent 76f34f1377
commit 9fc925805d
No known key found for this signature in database
GPG Key ID: E3EF0D6F671851C5
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/gpu/drm/vc4/vc4_dsi.c
View File

@ -556,7 +556,7 @@ struct vc4_dsi {
struct platform_device *pdev;
struct drm_bridge *bridge;
struct drm_bridge *out_bridge;
struct list_head bridge_chain;
void __iomem *regs;
@ -807,7 +807,7 @@ static void vc4_dsi_encoder_disable(struct drm_encoder *encoder)
if (iter->funcs->disable)
iter->funcs->disable(iter);
if (iter == dsi->bridge)
if (iter == dsi->out_bridge)
break;
}
@ -1730,9 +1730,9 @@ static int vc4_dsi_bind(struct device *dev, struct device *master, void *data)
return ret;
}
dsi->bridge = drmm_of_get_bridge(drm, dev->of_node, 0, 0);
if (IS_ERR(dsi->bridge))
return PTR_ERR(dsi->bridge);
dsi->out_bridge = drmm_of_get_bridge(drm, dev->of_node, 0, 0);
if (IS_ERR(dsi->out_bridge))
return PTR_ERR(dsi->out_bridge);
/* The esc clock rate is supposed to always be 100Mhz. */
ret = clk_set_rate(dsi->escape_clock, 100 * 1000000);
@ -1758,7 +1758,7 @@ static int vc4_dsi_bind(struct device *dev, struct device *master, void *data)
if (ret)
return ret;
ret = drm_bridge_attach(encoder, dsi->bridge, NULL, 0);
ret = drm_bridge_attach(encoder, dsi->out_bridge, NULL, 0);
if (ret)
return ret;
/* Disable the atomic helper calls into the bridge. We