Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Tue, 19 Apr 2022 14:41:59 +0200
From:   Maxime Ripard <maxime@cerno.tech>
To:     =?utf-8?B?Sm9zw6kgRXhww7NzaXRv?= <jose.exposito89@gmail.com>
Cc:     emma@anholt.net, laurent.pinchart@ideasonboard.com,
        airlied@linux.ie, daniel@ffwll.ch, p.zabel@pengutronix.de,
        dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2 2/2] drm/vc4: hdmi: Remove
 vc4_hdmi_encoder.hdmi_monitor
Message-ID: <20220419124159.2fjadxdornszocrk@houat>
References: <20220415154745.170597-1-jose.exposito89@gmail.com>
 <20220415154745.170597-3-jose.exposito89@gmail.com>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
        protocol="application/pgp-signature"; boundary="tlaqz3cdfyvvwz3z"
Content-Disposition: inline
In-Reply-To: <20220415154745.170597-3-jose.exposito89@gmail.com>
Precedence: bulk


--tlaqz3cdfyvvwz3z
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Hi,

On Fri, Apr 15, 2022 at 05:47:45PM +0200, Jos=E9 Exp=F3sito wrote:
> The vc4_hdmi_encoder.hdmi_monitor field was used to cache the value
> returned by drm_detect_hdmi_monitor() in order to avoid calling it
> multiple times.
>=20
> Now that drm_detect_hdmi_monitor() has been replaced with
> drm_display_info.is_hdmi, there is no need to cache it in the driver
> encoder struct.
>=20
> Remove vc4_hdmi_encoder.hdmi_monitor and use drm_display_info.is_hdmi
> instead.
>=20
> Signed-off-by: Jos=E9 Exp=F3sito <jose.exposito89@gmail.com>
> ---
>  drivers/gpu/drm/vc4/vc4_hdmi.c | 17 ++++++-----------
>  drivers/gpu/drm/vc4/vc4_hdmi.h |  1 -
>  2 files changed, 6 insertions(+), 12 deletions(-)
>=20
> diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdm=
i.c
> index ecdb1ffc2023..9c73a211ae80 100644
> --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
> +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
> @@ -107,9 +107,9 @@ static bool vc4_hdmi_mode_needs_scrambling(const stru=
ct drm_display_mode *mode)
>  static bool vc4_hdmi_is_full_range_rgb(struct vc4_hdmi *vc4_hdmi,
>  				       const struct drm_display_mode *mode)
>  {
> -	struct vc4_hdmi_encoder *vc4_encoder =3D &vc4_hdmi->encoder;
> +	struct drm_display_info *display =3D &vc4_hdmi->connector.display_info;
> =20
> -	return !vc4_encoder->hdmi_monitor ||
> +	return !display->is_hdmi ||
>  		drm_default_rgb_quant_range(mode) =3D=3D HDMI_QUANTIZATION_RANGE_FULL;
>  }
> =20
> @@ -216,7 +216,6 @@ vc4_hdmi_connector_detect(struct drm_connector *conne=
ctor, bool force)
> =20
>  			if (edid) {
>  				cec_s_phys_addr_from_edid(vc4_hdmi->cec_adap, edid);
> -				vc4_hdmi->encoder.hdmi_monitor =3D connector->display_info.is_hdmi;

I think the first patch could be squashed into this one

>  				kfree(edid);
>  			}
>  		}
> @@ -242,7 +241,6 @@ static void vc4_hdmi_connector_destroy(struct drm_con=
nector *connector)
>  static int vc4_hdmi_connector_get_modes(struct drm_connector *connector)
>  {
>  	struct vc4_hdmi *vc4_hdmi =3D connector_to_vc4_hdmi(connector);
> -	struct vc4_hdmi_encoder *vc4_encoder =3D &vc4_hdmi->encoder;
>  	int ret =3D 0;
>  	struct edid *edid;
> =20
> @@ -255,8 +253,6 @@ static int vc4_hdmi_connector_get_modes(struct drm_co=
nnector *connector)
>  		goto out;
>  	}
> =20
> -	vc4_encoder->hdmi_monitor =3D connector->display_info.is_hdmi;
> -
>  	drm_connector_update_edid_property(connector, edid);
>  	ret =3D drm_add_edid_modes(connector, edid);
>  	kfree(edid);
> @@ -578,13 +574,12 @@ static void vc4_hdmi_set_infoframes(struct drm_enco=
der *encoder)
>  static bool vc4_hdmi_supports_scrambling(struct drm_encoder *encoder,
>  					 struct drm_display_mode *mode)
>  {
> -	struct vc4_hdmi_encoder *vc4_encoder =3D to_vc4_hdmi_encoder(encoder);
>  	struct vc4_hdmi *vc4_hdmi =3D encoder_to_vc4_hdmi(encoder);
>  	struct drm_display_info *display =3D &vc4_hdmi->connector.display_info;
> =20
>  	lockdep_assert_held(&vc4_hdmi->mutex);
> =20
> -	if (!vc4_encoder->hdmi_monitor)
> +	if (!display->is_hdmi)
>  		return false;
> =20
>  	if (!display->hdmi.scdc.supported ||
> @@ -1147,7 +1142,7 @@ static void vc4_hdmi_encoder_post_crtc_enable(struc=
t drm_encoder *encoder,
>  {
>  	struct vc4_hdmi *vc4_hdmi =3D encoder_to_vc4_hdmi(encoder);
>  	struct drm_display_mode *mode =3D &vc4_hdmi->saved_adjusted_mode;
> -	struct vc4_hdmi_encoder *vc4_encoder =3D to_vc4_hdmi_encoder(encoder);
> +	struct drm_display_info *display =3D &vc4_hdmi->connector.display_info;
>  	bool hsync_pos =3D mode->flags & DRM_MODE_FLAG_PHSYNC;
>  	bool vsync_pos =3D mode->flags & DRM_MODE_FLAG_PVSYNC;
>  	unsigned long flags;
> @@ -1168,7 +1163,7 @@ static void vc4_hdmi_encoder_post_crtc_enable(struc=
t drm_encoder *encoder,
>  	HDMI_WRITE(HDMI_VID_CTL,
>  		   HDMI_READ(HDMI_VID_CTL) & ~VC4_HD_VID_CTL_BLANKPIX);
> =20
> -	if (vc4_encoder->hdmi_monitor) {
> +	if (display->is_hdmi) {
>  		HDMI_WRITE(HDMI_SCHEDULER_CONTROL,
>  			   HDMI_READ(HDMI_SCHEDULER_CONTROL) |
>  			   VC4_HDMI_SCHEDULER_CONTROL_MODE_HDMI);
> @@ -1195,7 +1190,7 @@ static void vc4_hdmi_encoder_post_crtc_enable(struc=
t drm_encoder *encoder,
>  			  "!VC4_HDMI_SCHEDULER_CONTROL_HDMI_ACTIVE\n");
>  	}
> =20
> -	if (vc4_encoder->hdmi_monitor) {
> +	if (display->is_hdmi) {
>  		spin_lock_irqsave(&vc4_hdmi->hw_lock, flags);
> =20
>  		WARN_ON(!(HDMI_READ(HDMI_SCHEDULER_CONTROL) &
> diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_hdm=
i.h
> index 1076faeab616..44977002445f 100644
> --- a/drivers/gpu/drm/vc4/vc4_hdmi.h
> +++ b/drivers/gpu/drm/vc4/vc4_hdmi.h
> @@ -11,7 +11,6 @@
>  /* VC4 HDMI encoder KMS struct */
>  struct vc4_hdmi_encoder {
>  	struct vc4_encoder base;
> -	bool hdmi_monitor;
>  };

And vc4_hdmi_encoder doesn't hold anything anymore now, so it can be
removed as well. Doing it in a subsequent patch would probably be the
most readable.

Thanks!
Maxime

--tlaqz3cdfyvvwz3z
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iHUEABYKAB0WIQRcEzekXsqa64kGDp7j7w1vZxhRxQUCYl6uDAAKCRDj7w1vZxhR
xb26AP4qmTCMJsoyhGfRmeNGezGrZz1LlSEaEoWXWFeq84ErQQD+LCu2JVg40UH6
fqYdsSAZzRKTG0er8f0DZNdc6f4DWw4=
=hGU/
-----END PGP SIGNATURE-----

--tlaqz3cdfyvvwz3z--