| From 71e6e1617b0fd2d934a92579fbee89881fbf38c6 Mon Sep 17 00:00:00 2001 |
| From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Date: Tue, 26 May 2015 14:59:42 +0300 |
| Subject: [PATCH 084/129] drm: rcar-du: Clarify error message when encoder |
| initialization fails |
| |
| A failure to initialize an encoder currently prints an error message in |
| the kernel log without mentioning which encoder failed to initialize. To |
| help debugging initialization issues print the encoder DT node name. |
| |
| This requires moving the error message to the rcar_du_encoders_init_one |
| function and refactoring it slightly. |
| |
| Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| (cherry picked from commit 64549cdf85a113270729aa123aa475cec7249a0f) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/gpu/drm/rcar-du/rcar_du_kms.c | 7 +++++-- |
| 1 file changed, 5 insertions(+), 2 deletions(-) |
| |
| diff --git a/drivers/gpu/drm/rcar-du/rcar_du_kms.c b/drivers/gpu/drm/rcar-du/rcar_du_kms.c |
| index 4bb5af4bc474..ab29c179d854 100644 |
| --- a/drivers/gpu/drm/rcar-du/rcar_du_kms.c |
| +++ b/drivers/gpu/drm/rcar-du/rcar_du_kms.c |
| @@ -639,6 +639,11 @@ static int rcar_du_encoders_init_one(struct rcar_du_device *rcdu, |
| of_node_put(encoder); |
| of_node_put(connector); |
| |
| + if (ret && ret != -EPROBE_DEFER) |
| + dev_warn(rcdu->dev, |
| + "failed to initialize encoder %s (%d), skipping\n", |
| + encoder->full_name, ret); |
| + |
| return ret < 0 ? ret : 1; |
| } |
| |
| @@ -688,8 +693,6 @@ static int rcar_du_encoders_init(struct rcar_du_device *rcdu) |
| return ret; |
| } |
| |
| - dev_info(rcdu->dev, |
| - "encoder initialization failed, skipping\n"); |
| continue; |
| } |
| |
| -- |
| 2.6.2 |
| |
