2023-01-17 17:49:57

by Arnd Bergmann

Subject: [PATCH] vc4: fix build failure in vc4_dsi_dev_probe()

From: Arnd Bergmann <[email protected]>

The bridge->of_node field is defined inside of an #ifdef, which
results in a build failure when compile-testing the vc4_dsi driver
without CONFIG_OF:

drivers/gpu/drm/vc4/vc4_dsi.c: In function 'vc4_dsi_dev_probe':
drivers/gpu/drm/vc4/vc4_dsi.c:1822:20: error: 'struct drm_bridge' has no member named 'of_node'
1822 | dsi->bridge.of_node = dev->of_node;

Add another #ifdef in the place it is used in. Alternatively we
could consider dropping the #ifdef in the struct definition
and all other users.

Fixes: 78df640394cd ("drm/vc4: dsi: Convert to using a bridge instead of encoder")
Signed-off-by: Arnd Bergmann <[email protected]>
---
drivers/gpu/drm/vc4/vc4_dsi.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/drivers/gpu/drm/vc4/vc4_dsi.c b/drivers/gpu/drm/vc4/vc4_dsi.c
index 2a71321b9222..a5c075f802e4 100644
--- a/drivers/gpu/drm/vc4/vc4_dsi.c
+++ b/drivers/gpu/drm/vc4/vc4_dsi.c
@@ -1819,7 +1819,9 @@ static int vc4_dsi_dev_probe(struct platform_device *pdev)

dsi->pdev = pdev;
dsi->bridge.funcs = &vc4_dsi_bridge_funcs;
+#ifdef CONFIG_OF
dsi->bridge.of_node = dev->of_node;
+#endif
dsi->bridge.type = DRM_MODE_CONNECTOR_DSI;
dsi->dsi_host.ops = &vc4_dsi_host_ops;
dsi->dsi_host.dev = dev;
--
2.39.0

2023-01-17 18:35:37

by Maxime Ripard

Subject: Re: (subset) [PATCH] vc4: fix build failure in vc4_dsi_dev_probe()

On Tue, 17 Jan 2023 17:52:51 +0100, Arnd Bergmann wrote:
> The bridge->of_node field is defined inside of an #ifdef, which
> results in a build failure when compile-testing the vc4_dsi driver
> without CONFIG_OF:
>
> drivers/gpu/drm/vc4/vc4_dsi.c: In function 'vc4_dsi_dev_probe':
> drivers/gpu/drm/vc4/vc4_dsi.c:1822:20: error: 'struct drm_bridge' has no member named 'of_node'
> 1822 | dsi->bridge.of_node = dev->of_node;
>
> [...]

Applied to drm/drm-misc (drm-misc-next).

Thanks!
Maxime