From: Hoan Nguyen An <na-h...@jinso.co.jp>

Skip return EPROBE_DEFER when DRM_RCAR_DW_HDMI is disabled in case HDMI 
initialize.
At this time, the rcar-du driver not be able to successfully initialize
if disable DRM_RCAR_DW_HDMI (rcar_du_probe return error),
so can not use other features such as RGB Analog, this patch to fix.

Signed-off-by: Hoan Nguyen An <na-h...@jinso.co.jp>
---
 drivers/gpu/drm/rcar-du/rcar_du_encoder.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/drivers/gpu/drm/rcar-du/rcar_du_encoder.c 
b/drivers/gpu/drm/rcar-du/rcar_du_encoder.c
index f9c933d..4dbc508 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_encoder.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_encoder.c
@@ -66,8 +66,15 @@ int rcar_du_encoder_init(struct rcar_du_device *rcdu,
        /* Locate the DRM bridge from the encoder DT node. */
        bridge = of_drm_find_bridge(enc_node);
        if (!bridge) {
+#if IS_ENABLED(CONFIG_DRM_RCAR_DW_HDMI)
                ret = -EPROBE_DEFER;
                goto done;
+#else
+               if (output == RCAR_DU_OUTPUT_HDMI0 || 
+                   output == RCAR_DU_OUTPUT_HDMI1)
+                   ret = 0;
+                   goto done;
+#endif
        }
 
        ret = drm_encoder_init(rcdu->ddev, encoder, &encoder_funcs,
-- 
2.7.4

Reply via email to