From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753510AbbJGDmP (ORCPT ); Tue, 6 Oct 2015 23:42:15 -0400 Received: from lucky1.263xmail.com ([211.157.147.130]:52859 "EHLO lucky1.263xmail.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752667AbbJGDmO (ORCPT ); Tue, 6 Oct 2015 23:42:14 -0400 X-263anti-spam: KSV:0; X-MAIL-GRAY: 1 X-MAIL-DELIVERY: 0 X-KSVirus-check: 0 X-ABS-CHECKED: 4 X-ADDR-CHECKED: 0 X-RL-SENDER: ykk@rock-chips.com X-FST-TO: airlied@linux.ie X-SENDER-IP: 58.22.7.114 X-LOGIN-NAME: ykk@rock-chips.com X-UNIQUE-TAG: <13c2de7fa9907084edfe27699cfdf345> X-ATTACHMENT-NUM: 0 X-DNS-TYPE: 0 Message-ID: <56149490.60902@rock-chips.com> Date: Wed, 07 Oct 2015 11:42:08 +0800 From: Yakir Yang User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.8.0 MIME-Version: 1.0 To: Russell King , linux-rockchip@lists.infradead.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org CC: Philipp Zabel , Andy Yan , Fabio Estevam , Sascha Hauer , Jon Nettleton , David Airlie Subject: Re: [PATCH 07/12] drm: bridge/dw_hdmi: enable audio only if sink supports audio References: <20150808160251.GM7557@n2100.arm.linux.org.uk> In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Russell & Andy On 08/09/2015 12:03 AM, Russell King wrote: > Only enable audio support if the sink supports audio in some form, as > defined via its EDID. We discover this capability using the generic > drm_detect_monitor_audio() function. > > Signed-off-by: Russell King Some to 06/12 reply. Tested-by: Yakir Yang - Yakir > --- > drivers/gpu/drm/bridge/dw_hdmi.c | 12 +++++++++--- > 1 file changed, 9 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/bridge/dw_hdmi.c b/drivers/gpu/drm/bridge/dw_hdmi.c > index 7f764716f3c4..578d7362cd65 100644 > --- a/drivers/gpu/drm/bridge/dw_hdmi.c > +++ b/drivers/gpu/drm/bridge/dw_hdmi.c > @@ -123,6 +123,7 @@ struct dw_hdmi { > struct i2c_adapter *ddc; > void __iomem *regs; > bool sink_is_hdmi; > + bool sink_has_audio; > > spinlock_t audio_lock; > struct mutex audio_mutex; > @@ -1271,13 +1272,17 @@ static int dw_hdmi_setup(struct dw_hdmi *hdmi, struct drm_display_mode *mode) > /* HDMI Initialization Step B.3 */ > dw_hdmi_enable_video_path(hdmi); > > - /* not for DVI mode */ > - if (hdmi->sink_is_hdmi) { > - dev_dbg(hdmi->dev, "%s HDMI mode\n", __func__); > + if (hdmi->sink_has_audio) { > + dev_dbg(hdmi->dev, "sink has audio support\n"); > > /* HDMI Initialization Step E - Configure audio */ > hdmi_clk_regenerator_update_pixel_clock(hdmi); > hdmi_enable_audio_clk(hdmi); > + } > + > + /* not for DVI mode */ > + if (hdmi->sink_is_hdmi) { > + dev_dbg(hdmi->dev, "%s HDMI mode\n", __func__); > > /* HDMI Initialization Step F - Configure AVI InfoFrame */ > hdmi_config_AVI(hdmi, mode); > @@ -1442,6 +1447,7 @@ static int dw_hdmi_connector_get_modes(struct drm_connector *connector) > edid->width_cm, edid->height_cm); > > hdmi->sink_is_hdmi = drm_detect_hdmi_monitor(edid); > + hdmi->sink_has_audio = drm_detect_monitor_audio(edid); > drm_mode_connector_update_edid_property(connector, edid); > ret = drm_add_edid_modes(connector, edid); > kfree(edid); From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yakir Yang Subject: Re: [PATCH 07/12] drm: bridge/dw_hdmi: enable audio only if sink supports audio Date: Wed, 07 Oct 2015 11:42:08 +0800 Message-ID: <56149490.60902@rock-chips.com> References: <20150808160251.GM7557@n2100.arm.linux.org.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: 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: Russell King , linux-rockchip@lists.infradead.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Fabio Estevam , Andy Yan List-Id: linux-rockchip.vger.kernel.org SGkgUnVzc2VsbCAmIEFuZHkKCk9uIDA4LzA5LzIwMTUgMTI6MDMgQU0sIFJ1c3NlbGwgS2luZyB3 cm90ZToKPiBPbmx5IGVuYWJsZSBhdWRpbyBzdXBwb3J0IGlmIHRoZSBzaW5rIHN1cHBvcnRzIGF1 ZGlvIGluIHNvbWUgZm9ybSwgYXMKPiBkZWZpbmVkIHZpYSBpdHMgRURJRC4gIFdlIGRpc2NvdmVy IHRoaXMgY2FwYWJpbGl0eSB1c2luZyB0aGUgZ2VuZXJpYwo+IGRybV9kZXRlY3RfbW9uaXRvcl9h dWRpbygpIGZ1bmN0aW9uLgo+Cj4gU2lnbmVkLW9mZi1ieTogUnVzc2VsbCBLaW5nIDxybWsra2Vy bmVsQGFybS5saW51eC5vcmcudWs+CgpTb21lIHRvIDA2LzEyIHJlcGx5LgoKVGVzdGVkLWJ5OiBZ YWtpciBZYW5nIDx5a2tAcm9jay1jaGlwcy5jb20+CgotIFlha2lyCj4gLS0tCj4gICBkcml2ZXJz L2dwdS9kcm0vYnJpZGdlL2R3X2hkbWkuYyB8IDEyICsrKysrKysrKy0tLQo+ICAgMSBmaWxlIGNo YW5nZWQsIDkgaW5zZXJ0aW9ucygrKSwgMyBkZWxldGlvbnMoLSkKPgo+IGRpZmYgLS1naXQgYS9k cml2ZXJzL2dwdS9kcm0vYnJpZGdlL2R3X2hkbWkuYyBiL2RyaXZlcnMvZ3B1L2RybS9icmlkZ2Uv ZHdfaGRtaS5jCj4gaW5kZXggN2Y3NjQ3MTZmM2M0Li41NzhkNzM2MmNkNjUgMTAwNjQ0Cj4gLS0t IGEvZHJpdmVycy9ncHUvZHJtL2JyaWRnZS9kd19oZG1pLmMKPiArKysgYi9kcml2ZXJzL2dwdS9k cm0vYnJpZGdlL2R3X2hkbWkuYwo+IEBAIC0xMjMsNiArMTIzLDcgQEAgc3RydWN0IGR3X2hkbWkg ewo+ICAgCXN0cnVjdCBpMmNfYWRhcHRlciAqZGRjOwo+ICAgCXZvaWQgX19pb21lbSAqcmVnczsK PiAgIAlib29sIHNpbmtfaXNfaGRtaTsKPiArCWJvb2wgc2lua19oYXNfYXVkaW87Cj4gICAKPiAg IAlzcGlubG9ja190IGF1ZGlvX2xvY2s7Cj4gICAJc3RydWN0IG11dGV4IGF1ZGlvX211dGV4Owo+ IEBAIC0xMjcxLDEzICsxMjcyLDE3IEBAIHN0YXRpYyBpbnQgZHdfaGRtaV9zZXR1cChzdHJ1Y3Qg ZHdfaGRtaSAqaGRtaSwgc3RydWN0IGRybV9kaXNwbGF5X21vZGUgKm1vZGUpCj4gICAJLyogSERN SSBJbml0aWFsaXphdGlvbiBTdGVwIEIuMyAqLwo+ICAgCWR3X2hkbWlfZW5hYmxlX3ZpZGVvX3Bh dGgoaGRtaSk7Cj4gICAKPiAtCS8qIG5vdCBmb3IgRFZJIG1vZGUgKi8KPiAtCWlmIChoZG1pLT5z aW5rX2lzX2hkbWkpIHsKPiAtCQlkZXZfZGJnKGhkbWktPmRldiwgIiVzIEhETUkgbW9kZVxuIiwg X19mdW5jX18pOwo+ICsJaWYgKGhkbWktPnNpbmtfaGFzX2F1ZGlvKSB7Cj4gKwkJZGV2X2RiZyho ZG1pLT5kZXYsICJzaW5rIGhhcyBhdWRpbyBzdXBwb3J0XG4iKTsKPiAgIAo+ICAgCQkvKiBIRE1J IEluaXRpYWxpemF0aW9uIFN0ZXAgRSAtIENvbmZpZ3VyZSBhdWRpbyAqLwo+ICAgCQloZG1pX2Ns a19yZWdlbmVyYXRvcl91cGRhdGVfcGl4ZWxfY2xvY2soaGRtaSk7Cj4gICAJCWhkbWlfZW5hYmxl X2F1ZGlvX2NsayhoZG1pKTsKPiArCX0KPiArCj4gKwkvKiBub3QgZm9yIERWSSBtb2RlICovCj4g KwlpZiAoaGRtaS0+c2lua19pc19oZG1pKSB7Cj4gKwkJZGV2X2RiZyhoZG1pLT5kZXYsICIlcyBI RE1JIG1vZGVcbiIsIF9fZnVuY19fKTsKPiAgIAo+ICAgCQkvKiBIRE1JIEluaXRpYWxpemF0aW9u IFN0ZXAgRiAtIENvbmZpZ3VyZSBBVkkgSW5mb0ZyYW1lICovCj4gICAJCWhkbWlfY29uZmlnX0FW SShoZG1pLCBtb2RlKTsKPiBAQCAtMTQ0Miw2ICsxNDQ3LDcgQEAgc3RhdGljIGludCBkd19oZG1p X2Nvbm5lY3Rvcl9nZXRfbW9kZXMoc3RydWN0IGRybV9jb25uZWN0b3IgKmNvbm5lY3RvcikKPiAg IAkJCWVkaWQtPndpZHRoX2NtLCBlZGlkLT5oZWlnaHRfY20pOwo+ICAgCj4gICAJCWhkbWktPnNp bmtfaXNfaGRtaSA9IGRybV9kZXRlY3RfaGRtaV9tb25pdG9yKGVkaWQpOwo+ICsJCWhkbWktPnNp bmtfaGFzX2F1ZGlvID0gZHJtX2RldGVjdF9tb25pdG9yX2F1ZGlvKGVkaWQpOwo+ICAgCQlkcm1f bW9kZV9jb25uZWN0b3JfdXBkYXRlX2VkaWRfcHJvcGVydHkoY29ubmVjdG9yLCBlZGlkKTsKPiAg IAkJcmV0ID0gZHJtX2FkZF9lZGlkX21vZGVzKGNvbm5lY3RvciwgZWRpZCk7Cj4gICAJCWtmcmVl KGVkaWQpOwoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f CmRyaS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpo dHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 From: ykk@rock-chips.com (Yakir Yang) Date: Wed, 07 Oct 2015 11:42:08 +0800 Subject: [PATCH 07/12] drm: bridge/dw_hdmi: enable audio only if sink supports audio In-Reply-To: References: <20150808160251.GM7557@n2100.arm.linux.org.uk> Message-ID: <56149490.60902@rock-chips.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Hi Russell & Andy On 08/09/2015 12:03 AM, Russell King wrote: > Only enable audio support if the sink supports audio in some form, as > defined via its EDID. We discover this capability using the generic > drm_detect_monitor_audio() function. > > Signed-off-by: Russell King Some to 06/12 reply. Tested-by: Yakir Yang - Yakir > --- > drivers/gpu/drm/bridge/dw_hdmi.c | 12 +++++++++--- > 1 file changed, 9 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/bridge/dw_hdmi.c b/drivers/gpu/drm/bridge/dw_hdmi.c > index 7f764716f3c4..578d7362cd65 100644 > --- a/drivers/gpu/drm/bridge/dw_hdmi.c > +++ b/drivers/gpu/drm/bridge/dw_hdmi.c > @@ -123,6 +123,7 @@ struct dw_hdmi { > struct i2c_adapter *ddc; > void __iomem *regs; > bool sink_is_hdmi; > + bool sink_has_audio; > > spinlock_t audio_lock; > struct mutex audio_mutex; > @@ -1271,13 +1272,17 @@ static int dw_hdmi_setup(struct dw_hdmi *hdmi, struct drm_display_mode *mode) > /* HDMI Initialization Step B.3 */ > dw_hdmi_enable_video_path(hdmi); > > - /* not for DVI mode */ > - if (hdmi->sink_is_hdmi) { > - dev_dbg(hdmi->dev, "%s HDMI mode\n", __func__); > + if (hdmi->sink_has_audio) { > + dev_dbg(hdmi->dev, "sink has audio support\n"); > > /* HDMI Initialization Step E - Configure audio */ > hdmi_clk_regenerator_update_pixel_clock(hdmi); > hdmi_enable_audio_clk(hdmi); > + } > + > + /* not for DVI mode */ > + if (hdmi->sink_is_hdmi) { > + dev_dbg(hdmi->dev, "%s HDMI mode\n", __func__); > > /* HDMI Initialization Step F - Configure AVI InfoFrame */ > hdmi_config_AVI(hdmi, mode); > @@ -1442,6 +1447,7 @@ static int dw_hdmi_connector_get_modes(struct drm_connector *connector) > edid->width_cm, edid->height_cm); > > hdmi->sink_is_hdmi = drm_detect_hdmi_monitor(edid); > + hdmi->sink_has_audio = drm_detect_monitor_audio(edid); > drm_mode_connector_update_edid_property(connector, edid); > ret = drm_add_edid_modes(connector, edid); > kfree(edid);