| From 338ec844533e7bb1120f88f83a3fcc1d9618eef7 Mon Sep 17 00:00:00 2001 |
| From: Arnd Bergmann <arnd@arndb.de> |
| Date: Mon, 23 Jan 2017 13:20:38 +0100 |
| Subject: [PATCH 255/255] drm: bridge: dw-hdmi: fix building without CONFIG_OF |
| |
| The of_node member in struct drm_bridge is hidden when CONFIG_OF |
| is disabled, causing a build error: |
| |
| drivers/gpu/drm/bridge/dw-hdmi.c: In function '__dw_hdmi_probe': |
| drivers/gpu/drm/bridge/dw-hdmi.c:2063:14: error: 'struct drm_bridge' has no member named 'of_node' |
| |
| We could fix this either using a Kconfig dependency on CONFIG_OF |
| or making the one line conditional. The latter gives us better |
| compile test coverage, so this is what I'm doing here. |
| |
| Fixes: 69497eb9234e ("drm: bridge: dw-hdmi: Implement DRM bridge registration") |
| Signed-off-by: Arnd Bergmann <arnd@arndb.de> |
| Signed-off-by: Archit Taneja <architt@codeaurora.org> |
| Link: http://patchwork.freedesktop.org/patch/msgid/20170123122312.3290934-1-arnd@arndb.de |
| (cherry picked from commit d5ad78436a8829c9951d82b1b0bdec761dbabfa9) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/gpu/drm/bridge/dw-hdmi.c | 2 ++ |
| 1 file changed, 2 insertions(+) |
| |
| --- a/drivers/gpu/drm/bridge/dw-hdmi.c |
| +++ b/drivers/gpu/drm/bridge/dw-hdmi.c |
| @@ -2060,7 +2060,9 @@ __dw_hdmi_probe(struct platform_device * |
| |
| hdmi->bridge.driver_private = hdmi; |
| hdmi->bridge.funcs = &dw_hdmi_bridge_funcs; |
| +#ifdef CONFIG_OF |
| hdmi->bridge.of_node = pdev->dev.of_node; |
| +#endif |
| |
| ret = dw_hdmi_fb_registered(hdmi); |
| if (ret) |
