drm_of_find_panel_or_bridge may return a different error code than
EPROBE_DEFER so let's not overwrite it.
At the same time, let's demote the DRM_DEV_ERROR message to
dev_err_probe so that the scary message isn't shown (by default)
whenever EPROBE_DEFER is returned to not mislead users.
Signed-off-by: Quentin Schulz <[email protected]>
---
Changes in v2:
- add a patch for not overwriting return code with EPROBE_DEFER
- use dev_err_probe instead of DRM_DEV_DEBUG
- Link to v1: https://lore.kernel.org/r/20231117-rk-lvds-defer-msg-v1-1-1e6894cf9a74@theobroma-systems.com
---
Quentin Schulz (2):
drm/rockchip: lvds: do not overwrite error code
drm/rockchip: lvds: do not print scary message when probing defer
drivers/gpu/drm/rockchip/rockchip_lvds.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
---
base-commit: 98b1cc82c4affc16f5598d4fa14b1858671b2263
change-id: 20231117-rk-lvds-defer-msg-b2944b73d791
Best regards,
--
Quentin Schulz <[email protected]>
From: Quentin Schulz <[email protected]>
ret variable stores the return value of drm_of_find_panel_or_bridge
which can return error codes different from EPROBE_DEFER. Therefore,
let's just return that error code instead of forcing it to EPROBE_DEFER.
Fixes: 34cc0aa25456 ("drm/rockchip: Add support for Rockchip Soc LVDS")
Cc: Quentin Schulz <[email protected]>
Signed-off-by: Quentin Schulz <[email protected]>
---
drivers/gpu/drm/rockchip/rockchip_lvds.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/gpu/drm/rockchip/rockchip_lvds.c b/drivers/gpu/drm/rockchip/rockchip_lvds.c
index f0f47e9abf5a..17d8fc797151 100644
--- a/drivers/gpu/drm/rockchip/rockchip_lvds.c
+++ b/drivers/gpu/drm/rockchip/rockchip_lvds.c
@@ -578,7 +578,6 @@ static int rockchip_lvds_bind(struct device *dev, struct device *master,
goto err_put_port;
} else if (ret) {
DRM_DEV_ERROR(dev, "failed to find panel and bridge node\n");
- ret = -EPROBE_DEFER;
goto err_put_port;
}
if (lvds->panel)
--
2.42.0
From: Quentin Schulz <[email protected]>
This scary message can misled the user into thinking something bad has
happened and needs to be fixed, however it could simply be part of a
normal boot process where EPROBE_DEFER is taken into account. Therefore,
let's use dev_err_probe so that this message doesn't get shown (by
default) when the return code is EPROBE_DEFER.
Fixes: 34cc0aa25456 ("drm/rockchip: Add support for Rockchip Soc LVDS")
Cc: Quentin Schulz <[email protected]>
Signed-off-by: Quentin Schulz <[email protected]>
---
drivers/gpu/drm/rockchip/rockchip_lvds.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/rockchip/rockchip_lvds.c b/drivers/gpu/drm/rockchip/rockchip_lvds.c
index 17d8fc797151..f2831d304e7b 100644
--- a/drivers/gpu/drm/rockchip/rockchip_lvds.c
+++ b/drivers/gpu/drm/rockchip/rockchip_lvds.c
@@ -577,7 +577,7 @@ static int rockchip_lvds_bind(struct device *dev, struct device *master,
ret = -EINVAL;
goto err_put_port;
} else if (ret) {
- DRM_DEV_ERROR(dev, "failed to find panel and bridge node\n");
+ dev_err_probe(dev, ret, "failed to find panel and bridge node\n");
goto err_put_port;
}
if (lvds->panel)
--
2.42.0
On Mon, 20 Nov 2023 13:29:47 +0100, Quentin Schulz wrote:
> drm_of_find_panel_or_bridge may return a different error code than
> EPROBE_DEFER so let's not overwrite it.
>
> At the same time, let's demote the DRM_DEV_ERROR message to
> dev_err_probe so that the scary message isn't shown (by default)
> whenever EPROBE_DEFER is returned to not mislead users.
>
> [...]
Applied, thanks!
[1/2] drm/rockchip: lvds: do not overwrite error code
commit: 79b09453c4e369ca81cfb670d0136d089e3b92f0
[2/2] drm/rockchip: lvds: do not print scary message when probing defer
commit: 52d11c863ac92e36a0365249f7f6d27ac48c78bc
Best regards,
--
Heiko Stuebner <[email protected]>