From: Maxime Ripard <maxime.ripard@free-electrons.com>
To: Chen-Yu Tsai <wens@csie.org>
Cc: David Airlie <airlied@linux.ie>,
dri-devel@lists.freedesktop.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] drm/sun4i: Clear encoder->bridge if a bridge is not found
Date: Tue, 30 Aug 2016 14:56:22 +0200 [thread overview]
Message-ID: <20160830125622.GF18605@lukather> (raw)
In-Reply-To: <20160830122223.21377-1-wens@csie.org>
[-- Attachment #1: Type: text/plain, Size: 2114 bytes --]
Hi,
On Tue, Aug 30, 2016 at 08:22:23PM +0800, Chen-Yu Tsai wrote:
> The KMS helpers (drm_atomic_helper_check_modeset/mode_fixup) pass
> encoder->bridge directly to drm_bridge_mode_fixup, which expects a
> valid pointer, or NULL (in which case it just returns).
>
> Clear encoder->bridge if a bridge is not found, instead of keeping
> the ERR_PTR value.
>
> Since other drm_bridge functions also follow this pattern of checking
> for a non-NULL pointer, we can drop the ifs around the calls and just
> pass the pointer directly.
>
> Fixes: 894f5a9f4b4a ("drm/sun4i: Add bridge support")
> Signed-off-by: Chen-Yu Tsai <wens@csie.org>
> ---
> drivers/gpu/drm/sun4i/sun4i_rgb.c | 11 ++++++-----
> 1 file changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/sun4i/sun4i_rgb.c b/drivers/gpu/drm/sun4i/sun4i_rgb.c
> index d4e52522ec53..ee0795152a33 100644
> --- a/drivers/gpu/drm/sun4i/sun4i_rgb.c
> +++ b/drivers/gpu/drm/sun4i/sun4i_rgb.c
> @@ -154,8 +154,7 @@ static void sun4i_rgb_encoder_enable(struct drm_encoder *encoder)
> if (!IS_ERR(tcon->panel))
> drm_panel_enable(tcon->panel);
>
> - if (!IS_ERR(encoder->bridge))
> - drm_bridge_enable(encoder->bridge);
> + drm_bridge_enable(encoder->bridge);
>
> sun4i_tcon_channel_enable(tcon, 0);
> }
> @@ -170,8 +169,7 @@ static void sun4i_rgb_encoder_disable(struct drm_encoder *encoder)
>
> sun4i_tcon_channel_disable(tcon, 0);
>
> - if (!IS_ERR(encoder->bridge))
> - drm_bridge_disable(encoder->bridge);
> + drm_bridge_disable(encoder->bridge);
I'd rather keep those changes, it makes it obvious that it's something
optionnal, that can be set to NULL.
> if (!IS_ERR(tcon->panel))
> drm_panel_disable(tcon->panel);
> @@ -230,6 +228,9 @@ int sun4i_rgb_init(struct drm_device *drm)
> return 0;
> }
>
> + if (IS_ERR(encoder->bridge))
> + encoder->bridge = NULL;
> +
And that could be the else condition of the if statement below.
Thanks!
Maxime
--
Maxime Ripard, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next prev parent reply other threads:[~2016-08-30 12:56 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-30 12:22 [PATCH] drm/sun4i: Clear encoder->bridge if a bridge is not found Chen-Yu Tsai
2016-08-30 12:56 ` Maxime Ripard [this message]
2016-08-30 15:51 ` Chen-Yu Tsai
2016-08-31 11:09 ` Chen-Yu Tsai
2016-08-31 16:41 ` Maxime Ripard
2016-08-31 15:40 ` Maxime Ripard
2016-08-31 16:27 ` Daniel Vetter
2016-08-31 16:43 ` Maxime Ripard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160830125622.GF18605@lukather \
--to=maxime.ripard@free-electrons.com \
--cc=airlied@linux.ie \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=wens@csie.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).