From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 32568ECAAD5 for ; Mon, 5 Sep 2022 10:48:59 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0BA9310E2CB; Mon, 5 Sep 2022 10:48:34 +0000 (UTC) Received: from gloria.sntech.de (gloria.sntech.de [185.11.138.130]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6000810E2B5; Mon, 5 Sep 2022 10:48:25 +0000 (UTC) Received: from ip5b412258.dynamic.kabel-deutschland.de ([91.65.34.88] helo=diego.localnet) by gloria.sntech.de with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1oV96T-0005L3-MN; Mon, 05 Sep 2022 12:13:17 +0200 From: Heiko =?ISO-8859-1?Q?St=FCbner?= To: dri-devel@lists.freedesktop.org, Jani Nikula Date: Mon, 05 Sep 2022 12:13:17 +0200 Message-ID: <11952780.MucGe3eQFb@diego> In-Reply-To: <429e4b3f905b070fb985ce7388b9637e2b4704dd.1662036058.git.jani.nikula@intel.com> References: <429e4b3f905b070fb985ce7388b9637e2b4704dd.1662036058.git.jani.nikula@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="iso-8859-1" Subject: Re: [Intel-gfx] [PATCH 9/9] drm/rockchip: convert to using has_audio from display_info X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jani Nikula , intel-gfx@lists.freedesktop.org, Laurent Pinchart , Sandy Huang Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Am Donnerstag, 1. September 2022, 14:47:11 CEST schrieb Jani Nikula: > Prefer the parsed results for has_audio in display info over calling > drm_detect_monitor_audio(). >=20 > Cc: Sandy Huang > Cc: Heiko St=FCbner > Signed-off-by: Jani Nikula Reviewed-by: Heiko Stuebner > --- > drivers/gpu/drm/rockchip/cdn-dp-core.c | 4 ++-- > drivers/gpu/drm/rockchip/inno_hdmi.c | 3 ++- > 2 files changed, 4 insertions(+), 3 deletions(-) >=20 > diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.c b/drivers/gpu/drm/roc= kchip/cdn-dp-core.c > index f77bdf5f5168..50af9861553b 100644 > --- a/drivers/gpu/drm/rockchip/cdn-dp-core.c > +++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c > @@ -272,10 +272,10 @@ static int cdn_dp_connector_get_modes(struct drm_co= nnector *connector) > DRM_DEV_DEBUG_KMS(dp->dev, "got edid: width[%d] x height[%d]\n", > edid->width_cm, edid->height_cm); > =20 > - dp->sink_has_audio =3D drm_detect_monitor_audio(edid); > - > drm_connector_update_edid_property(connector, edid); > ret =3D drm_add_edid_modes(connector, edid); > + > + dp->sink_has_audio =3D connector->display_info.has_audio; > } > mutex_unlock(&dp->lock); > =20 > diff --git a/drivers/gpu/drm/rockchip/inno_hdmi.c b/drivers/gpu/drm/rockc= hip/inno_hdmi.c > index 87b2243ea23e..fadaa795fb3d 100644 > --- a/drivers/gpu/drm/rockchip/inno_hdmi.c > +++ b/drivers/gpu/drm/rockchip/inno_hdmi.c > @@ -564,10 +564,11 @@ static int inno_hdmi_connector_get_modes(struct drm= _connector *connector) > =20 > edid =3D drm_get_edid(connector, hdmi->ddc); > if (edid) { > - hdmi->hdmi_data.sink_has_audio =3D drm_detect_monitor_audio(edid); > drm_connector_update_edid_property(connector, edid); > ret =3D drm_add_edid_modes(connector, edid); > kfree(edid); > + > + hdmi->hdmi_data.sink_has_audio =3D connector->display_info.has_audio; > } > =20 > return ret; >=20