2022-02-21 09:13:48

by José Expósito

[permalink] [raw]
Subject: [PATCH] drm: rcar-du: switch to devm_drm_of_get_bridge

The function "drm_of_find_panel_or_bridge" has been deprecated in
favor of "devm_drm_of_get_bridge".

Switch to the new function and reduce boilerplate.

Signed-off-by: José Expósito <[email protected]>
---
drivers/gpu/drm/rcar-du/rcar_lvds.c | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/drivers/gpu/drm/rcar-du/rcar_lvds.c b/drivers/gpu/drm/rcar-du/rcar_lvds.c
index 72a272cfc11e..99b0febc56d1 100644
--- a/drivers/gpu/drm/rcar-du/rcar_lvds.c
+++ b/drivers/gpu/drm/rcar-du/rcar_lvds.c
@@ -712,18 +712,12 @@ static int rcar_lvds_parse_dt(struct rcar_lvds *lvds)
{
int ret;

- ret = drm_of_find_panel_or_bridge(lvds->dev->of_node, 1, 0,
- &lvds->panel, &lvds->next_bridge);
- if (ret)
+ lvds->next_bridge = devm_drm_of_get_bridge(lvds->dev,
+ lvds->dev->of_node,
+ 1, 0);
+ if (IS_ERR(lvds->next_bridge)) {
+ ret = -EINVAL;
goto done;
-
- if (lvds->panel) {
- lvds->next_bridge = devm_drm_panel_bridge_add(lvds->dev,
- lvds->panel);
- if (IS_ERR_OR_NULL(lvds->next_bridge)) {
- ret = -EINVAL;
- goto done;
- }
}

if (lvds->info->quirks & RCAR_LVDS_QUIRK_DUAL_LINK)
--
2.25.1


2022-02-21 12:13:23

by Maxime Ripard

[permalink] [raw]
Subject: Re: [PATCH] drm: rcar-du: switch to devm_drm_of_get_bridge

On Mon, Feb 21, 2022 at 08:37:57AM +0100, Jos? Exp?sito wrote:
> The function "drm_of_find_panel_or_bridge" has been deprecated in
> favor of "devm_drm_of_get_bridge".
>
> Switch to the new function and reduce boilerplate.
>
> Signed-off-by: Jos? Exp?sito <[email protected]>
> ---
> drivers/gpu/drm/rcar-du/rcar_lvds.c | 16 +++++-----------
> 1 file changed, 5 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/gpu/drm/rcar-du/rcar_lvds.c b/drivers/gpu/drm/rcar-du/rcar_lvds.c
> index 72a272cfc11e..99b0febc56d1 100644
> --- a/drivers/gpu/drm/rcar-du/rcar_lvds.c
> +++ b/drivers/gpu/drm/rcar-du/rcar_lvds.c
> @@ -712,18 +712,12 @@ static int rcar_lvds_parse_dt(struct rcar_lvds *lvds)
> {
> int ret;
>
> - ret = drm_of_find_panel_or_bridge(lvds->dev->of_node, 1, 0,
> - &lvds->panel, &lvds->next_bridge);

I guess lvds->panel can be removed from the rcar_lvds struct as well?

Maxime


Attachments:
(No filename) (940.00 B)
signature.asc (235.00 B)
Download all attachments

2022-02-21 14:47:49

by Laurent Pinchart

[permalink] [raw]
Subject: Re: [PATCH] drm: rcar-du: switch to devm_drm_of_get_bridge

On Mon, Feb 21, 2022 at 09:56:19AM +0100, Maxime Ripard wrote:
> On Mon, Feb 21, 2022 at 08:37:57AM +0100, José Expósito wrote:
> > The function "drm_of_find_panel_or_bridge" has been deprecated in
> > favor of "devm_drm_of_get_bridge".
> >
> > Switch to the new function and reduce boilerplate.
> >
> > Signed-off-by: José Expósito <[email protected]>
> > ---
> > drivers/gpu/drm/rcar-du/rcar_lvds.c | 16 +++++-----------
> > 1 file changed, 5 insertions(+), 11 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/rcar-du/rcar_lvds.c b/drivers/gpu/drm/rcar-du/rcar_lvds.c
> > index 72a272cfc11e..99b0febc56d1 100644
> > --- a/drivers/gpu/drm/rcar-du/rcar_lvds.c
> > +++ b/drivers/gpu/drm/rcar-du/rcar_lvds.c
> > @@ -712,18 +712,12 @@ static int rcar_lvds_parse_dt(struct rcar_lvds *lvds)
> > {
> > int ret;
> >
> > - ret = drm_of_find_panel_or_bridge(lvds->dev->of_node, 1, 0,
> > - &lvds->panel, &lvds->next_bridge);
>
> I guess lvds->panel can be removed from the rcar_lvds struct as well?

It's used in rcar_lvds_get_lvds_mode() though, so this patch introduces
a regression.

--
Regards,

Laurent Pinchart

2022-02-28 20:01:27

by José Expósito

[permalink] [raw]
Subject: Re: [PATCH] drm: rcar-du: switch to devm_drm_of_get_bridge

On Mon, Feb 21, 2022 at 02:15:01PM +0200, Laurent Pinchart wrote:
> On Mon, Feb 21, 2022 at 09:56:19AM +0100, Maxime Ripard wrote:
> > I guess lvds->panel can be removed from the rcar_lvds struct as well?
>
> It's used in rcar_lvds_get_lvds_mode() though, so this patch introduces
> a regression.

True, my bad. Sorry about that.