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 X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 31BA3C43381 for ; Mon, 4 Mar 2019 15:11:07 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id ED05720652 for ; Mon, 4 Mar 2019 15:11:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="cu1X2qV6" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org ED05720652 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=bootlin.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Date:To:From:Subject:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=OeaRp52/JCu8uXR/8rTfKJlbkrdel0t4c6fw7f7PG70=; b=cu1X2qV6/vcTAa 1yI9madoow5hqbUI/GQbW941phqtx0RdayT5KfP0vqazk9zopYtAWn+1gYi88eFlCn4u10frZHCNf pEY3wnyf0HFEnvZPshmiKio7OOEa1qcMJi5hQaqSsxVVyAagHwpoPeaQh/ZXx7eOCCw7bl5OZwOyk +EqggVKzviCIFa1PwMfoORY7K3xZc4SjO5jSwwk40qdH3+nLFDYgSpR4qzo5moCRTPL/O5bWwdRMx NOw1NCaeTtdTyaWpoba94CwiSanv+j+VWdp3byzVmH4vPhHcqYrqiuKooBC2j7JMprirILz0KGsoY baFfKoRfKxBa02zyi0Ag==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1h0pF9-0007L0-Ok; Mon, 04 Mar 2019 15:11:03 +0000 Received: from relay10.mail.gandi.net ([217.70.178.230]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h0pF7-0007Ka-3G for linux-arm-kernel@lists.infradead.org; Mon, 04 Mar 2019 15:11:02 +0000 Received: from aptenodytes (aaubervilliers-681-1-27-150.w90-88.abo.wanadoo.fr [90.88.147.150]) (Authenticated sender: paul.kocialkowski@bootlin.com) by relay10.mail.gandi.net (Postfix) with ESMTPSA id AC055240003; Mon, 4 Mar 2019 15:10:55 +0000 (UTC) Message-ID: <754196b5433b3e97bdfe07c8286c087e11b00242.camel@bootlin.com> Subject: Re: [PATCH 1/7] drm/vc4: hdmi: Check that the monitor supports HDMI audio From: Paul Kocialkowski To: Maxime Ripard , Maarten Lankhorst , Sean Paul , Daniel Vetter , David Airlie Date: Mon, 04 Mar 2019 16:10:55 +0100 In-Reply-To: References: Organization: Bootlin User-Agent: Evolution 3.30.5 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190304_071101_290683_66F613EE X-CRM114-Status: GOOD ( 17.24 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arm-kernel@lists.infradead.org, Eric Anholt , dri-devel@lists.freedesktop.org, Thomas Petazzoni , eben@raspberrypi.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi, On Mon, 2019-03-04 at 15:52 +0100, Maxime Ripard wrote: > The current code assumes as soon as the device is an HDMI one that it > supports an audio sink. However, strictly speaking, this is exposed as a > separate part of EDID. > > This can be checked through the drm_detect_monitor_audio function, so let's > use it and make sure that we can use the HDMI monitor as an output before > sending sound. > > Signed-off-by: Maxime Ripard Reviewed-by: Paul Kocialkowski Cheers, Paul > --- > drivers/gpu/drm/vc4/vc4_hdmi.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c > index 88fd5df7e7dc..a1bdc065c47c 100644 > --- a/drivers/gpu/drm/vc4/vc4_hdmi.c > +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c > @@ -109,6 +109,7 @@ struct vc4_hdmi_encoder { > struct vc4_encoder base; > bool hdmi_monitor; > bool limited_rgb_range; > + bool monitor_has_audio; > }; > > static inline struct vc4_hdmi_encoder * > @@ -278,6 +279,7 @@ static int vc4_hdmi_connector_get_modes(struct drm_connector *connector) > return -ENODEV; > > vc4_encoder->hdmi_monitor = drm_detect_hdmi_monitor(edid); > + vc4_encoder->monitor_has_audio = drm_detect_monitor_audio(edid); > > drm_connector_update_edid_property(connector, edid); > ret = drm_add_edid_modes(connector, edid); > @@ -785,9 +787,13 @@ static int vc4_hdmi_audio_startup(struct snd_pcm_substream *substream, > { > struct vc4_hdmi *hdmi = dai_to_hdmi(dai); > struct drm_encoder *encoder = hdmi->encoder; > + struct vc4_hdmi_encoder *vc4_encoder = to_vc4_hdmi_encoder(encoder); > struct vc4_dev *vc4 = to_vc4_dev(encoder->dev); > int ret; > > + if (!vc4_encoder->monitor_has_audio) > + return -ENODEV; > + > if (hdmi->audio.substream && hdmi->audio.substream != substream) > return -EINVAL; > -- Paul Kocialkowski, Bootlin Embedded Linux and kernel engineering https://bootlin.com _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paul Kocialkowski Subject: Re: [PATCH 1/7] drm/vc4: hdmi: Check that the monitor supports HDMI audio Date: Mon, 04 Mar 2019 16:10:55 +0100 Message-ID: <754196b5433b3e97bdfe07c8286c087e11b00242.camel@bootlin.com> References: Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from relay10.mail.gandi.net (relay10.mail.gandi.net [217.70.178.230]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4CECE89CF2 for ; Mon, 4 Mar 2019 15:10:59 +0000 (UTC) In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Maxime Ripard , Maarten Lankhorst , Sean Paul , Daniel Vetter , David Airlie Cc: linux-arm-kernel@lists.infradead.org, dri-devel@lists.freedesktop.org, Thomas Petazzoni , eben@raspberrypi.org List-Id: dri-devel@lists.freedesktop.org SGksCgpPbiBNb24sIDIwMTktMDMtMDQgYXQgMTU6NTIgKzAxMDAsIE1heGltZSBSaXBhcmQgd3Jv dGU6Cj4gVGhlIGN1cnJlbnQgY29kZSBhc3N1bWVzIGFzIHNvb24gYXMgdGhlIGRldmljZSBpcyBh biBIRE1JIG9uZSB0aGF0IGl0Cj4gc3VwcG9ydHMgYW4gYXVkaW8gc2luay4gSG93ZXZlciwgc3Ry aWN0bHkgc3BlYWtpbmcsIHRoaXMgaXMgZXhwb3NlZCBhcyBhCj4gc2VwYXJhdGUgcGFydCBvZiBF RElELgo+IAo+IFRoaXMgY2FuIGJlIGNoZWNrZWQgdGhyb3VnaCB0aGUgZHJtX2RldGVjdF9tb25p dG9yX2F1ZGlvIGZ1bmN0aW9uLCBzbyBsZXQncwo+IHVzZSBpdCBhbmQgbWFrZSBzdXJlIHRoYXQg d2UgY2FuIHVzZSB0aGUgSERNSSBtb25pdG9yIGFzIGFuIG91dHB1dCBiZWZvcmUKPiBzZW5kaW5n IHNvdW5kLgo+IAo+IFNpZ25lZC1vZmYtYnk6IE1heGltZSBSaXBhcmQgPG1heGltZS5yaXBhcmRA Ym9vdGxpbi5jb20+CgpSZXZpZXdlZC1ieTogUGF1bCBLb2NpYWxrb3dza2kgPHBhdWwua29jaWFs a293c2tpQGJvb3RsaW4uY29tPgoKQ2hlZXJzLAoKUGF1bAoKPiAtLS0KPiAgZHJpdmVycy9ncHUv ZHJtL3ZjNC92YzRfaGRtaS5jIHwgNiArKysrKysKPiAgMSBmaWxlIGNoYW5nZWQsIDYgaW5zZXJ0 aW9ucygrKQo+IAo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vdmM0L3ZjNF9oZG1pLmMg Yi9kcml2ZXJzL2dwdS9kcm0vdmM0L3ZjNF9oZG1pLmMKPiBpbmRleCA4OGZkNWRmN2U3ZGMuLmEx YmRjMDY1YzQ3YyAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vdmM0L3ZjNF9oZG1pLmMK PiArKysgYi9kcml2ZXJzL2dwdS9kcm0vdmM0L3ZjNF9oZG1pLmMKPiBAQCAtMTA5LDYgKzEwOSw3 IEBAIHN0cnVjdCB2YzRfaGRtaV9lbmNvZGVyIHsKPiAgCXN0cnVjdCB2YzRfZW5jb2RlciBiYXNl Owo+ICAJYm9vbCBoZG1pX21vbml0b3I7Cj4gIAlib29sIGxpbWl0ZWRfcmdiX3JhbmdlOwo+ICsJ Ym9vbCBtb25pdG9yX2hhc19hdWRpbzsKPiAgfTsKPiAgCj4gIHN0YXRpYyBpbmxpbmUgc3RydWN0 IHZjNF9oZG1pX2VuY29kZXIgKgo+IEBAIC0yNzgsNiArMjc5LDcgQEAgc3RhdGljIGludCB2YzRf aGRtaV9jb25uZWN0b3JfZ2V0X21vZGVzKHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3Ip Cj4gIAkJcmV0dXJuIC1FTk9ERVY7Cj4gIAo+ICAJdmM0X2VuY29kZXItPmhkbWlfbW9uaXRvciA9 IGRybV9kZXRlY3RfaGRtaV9tb25pdG9yKGVkaWQpOwo+ICsJdmM0X2VuY29kZXItPm1vbml0b3Jf aGFzX2F1ZGlvID0gZHJtX2RldGVjdF9tb25pdG9yX2F1ZGlvKGVkaWQpOwo+ICAKPiAgCWRybV9j b25uZWN0b3JfdXBkYXRlX2VkaWRfcHJvcGVydHkoY29ubmVjdG9yLCBlZGlkKTsKPiAgCXJldCA9 IGRybV9hZGRfZWRpZF9tb2Rlcyhjb25uZWN0b3IsIGVkaWQpOwo+IEBAIC03ODUsOSArNzg3LDEz IEBAIHN0YXRpYyBpbnQgdmM0X2hkbWlfYXVkaW9fc3RhcnR1cChzdHJ1Y3Qgc25kX3BjbV9zdWJz dHJlYW0gKnN1YnN0cmVhbSwKPiAgewo+ICAJc3RydWN0IHZjNF9oZG1pICpoZG1pID0gZGFpX3Rv X2hkbWkoZGFpKTsKPiAgCXN0cnVjdCBkcm1fZW5jb2RlciAqZW5jb2RlciA9IGhkbWktPmVuY29k ZXI7Cj4gKwlzdHJ1Y3QgdmM0X2hkbWlfZW5jb2RlciAqdmM0X2VuY29kZXIgPSB0b192YzRfaGRt aV9lbmNvZGVyKGVuY29kZXIpOwo+ICAJc3RydWN0IHZjNF9kZXYgKnZjNCA9IHRvX3ZjNF9kZXYo ZW5jb2Rlci0+ZGV2KTsKPiAgCWludCByZXQ7Cj4gIAo+ICsJaWYgKCF2YzRfZW5jb2Rlci0+bW9u aXRvcl9oYXNfYXVkaW8pCj4gKwkJcmV0dXJuIC1FTk9ERVY7Cj4gKwo+ICAJaWYgKGhkbWktPmF1 ZGlvLnN1YnN0cmVhbSAmJiBoZG1pLT5hdWRpby5zdWJzdHJlYW0gIT0gc3Vic3RyZWFtKQo+ICAJ CXJldHVybiAtRUlOVkFMOwo+ICAKLS0gClBhdWwgS29jaWFsa293c2tpLCBCb290bGluCkVtYmVk ZGVkIExpbnV4IGFuZCBrZXJuZWwgZW5naW5lZXJpbmcKaHR0cHM6Ly9ib290bGluLmNvbQoKX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1h aWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMu ZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVs