Skip to content

Commit f3651bc

Browse files
author
Laurent Pinchart
committed
drm: rcar-du: Use dev_err_probe() to record cause of KMS init errors
The (large) rcar_du_modeset_init() function can fail for many reasons, two of two involving probe deferral. Use dev_err_probe() in those code paths to record the cause of the probe deferral, in order to help debugging probe issues. Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
1 parent c58dcab commit f3651bc

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

drivers/gpu/drm/renesas/rcar-du/rcar_du_drv.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -696,6 +696,10 @@ static int rcar_du_probe(struct platform_device *pdev)
696696
/* DRM/KMS objects */
697697
ret = rcar_du_modeset_init(rcdu);
698698
if (ret < 0) {
699+
/*
700+
* Don't use dev_err_probe(), as it would overwrite the probe
701+
* deferral reason recorded in rcar_du_modeset_init().
702+
*/
699703
if (ret != -EPROBE_DEFER)
700704
dev_err(&pdev->dev,
701705
"failed to initialize DRM/KMS (%d)\n", ret);

drivers/gpu/drm/renesas/rcar-du/rcar_du_kms.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -935,7 +935,8 @@ int rcar_du_modeset_init(struct rcar_du_device *rcdu)
935935
/* Initialize the Color Management Modules. */
936936
ret = rcar_du_cmm_init(rcdu);
937937
if (ret)
938-
return ret;
938+
return dev_err_probe(rcdu->dev, ret,
939+
"failed to initialize CMM\n");
939940

940941
/* Create the CRTCs. */
941942
for (swindex = 0, hwindex = 0; swindex < rcdu->num_crtcs; ++hwindex) {
@@ -955,7 +956,8 @@ int rcar_du_modeset_init(struct rcar_du_device *rcdu)
955956
/* Initialize the encoders. */
956957
ret = rcar_du_encoders_init(rcdu);
957958
if (ret < 0)
958-
return ret;
959+
return dev_err_probe(rcdu->dev, ret,
960+
"failed to initialize encoders\n");
959961

960962
if (ret == 0) {
961963
dev_err(rcdu->dev, "error: no encoder could be initialized\n");

0 commit comments

Comments
 (0)