From mboxrd@z Thu Jan 1 00:00:00 1970 From: laurent.pinchart@ideasonboard.com (Laurent Pinchart) Date: Fri, 03 Mar 2017 14:16:58 +0200 Subject: [PATCH v2 2/2] drm: bridge: Move HPD handling to PHY operations In-Reply-To: <67b8ac3e-3227-8f32-7f20-0cd4b6d4510f@synopsys.com> References: <1488468572-31971-1-git-send-email-narmstrong@baylibre.com> <952185cf-16b8-b987-4737-96c2db4a0f6c@baylibre.com> <67b8ac3e-3227-8f32-7f20-0cd4b6d4510f@synopsys.com> Message-ID: <19854660.KZ12oiydRY@avalon> To: linus-amlogic@lists.infradead.org List-Id: linus-amlogic.lists.infradead.org Hi Jose, On Friday 03 Mar 2017 10:05:36 Jose Abreu wrote: > On 03-03-2017 09:07, Neil Armstrong wrote: > > The problem is that the HPD/RxSense is tied to this phy_mask and glued > > into the dw-hdmi driver. > > > > The *real* solution would be to completely separate the HPD/RxSense irq > > handling to a separate driver as a shared irq... > > > > If Jose is willing to give me some documentation and Freescale some > > boards, I'll be happy to do it ! > > Hmm, why don't get rid of phy_mask totally and just return the > new mask in update_hpd() function? Or add a get_hpd_status() > callback. (I also think there are too many callbacks. For example > we could have: setup, set_status, clear and then just use > parameters when needed: > void setup(bool force, bool disabled, bool rxsense) > void set_status(bool enable, bool enable_ints) > void clear() > > What do you think? I only checked quickly the code, don't know if > this is enough. For the record, that's more or less what I had in mind. The following preparatory patch could be useful. commit 5ceb6a93d78e21e5be195efe52c4c7e5578ac787 Author: Laurent Pinchart Date: Fri Mar 3 14:14:56 2017 +0200 drm: bridge: dw-hdmi: Extract PHY interrupt setup to a function In preparation for adding PHY operations to handle RX SENSE and HPD, group all the PHY interrupt setup code in a single location and extract it to a separate function. Signed-off-by: Laurent Pinchart diff --git a/drivers/gpu/drm/bridge/dw-hdmi.c b/drivers/gpu/drm/bridge/dw-hdmi.c index 026a0dce7661..1ed8bc12eed7 100644 --- a/drivers/gpu/drm/bridge/dw-hdmi.c +++ b/drivers/gpu/drm/bridge/dw-hdmi.c @@ -1496,7 +1496,7 @@ static int dw_hdmi_setup(struct dw_hdmi *hdmi, struct drm_display_mode *mode) } /* Wait until we are registered to enable interrupts */ -static int dw_hdmi_fb_registered(struct dw_hdmi *hdmi) +static void dw_hdmi_fb_registered(struct dw_hdmi *hdmi) { hdmi_writeb(hdmi, HDMI_PHY_I2CM_INT_ADDR_DONE_POL, HDMI_PHY_I2CM_INT_ADDR); @@ -1504,15 +1504,6 @@ static int dw_hdmi_fb_registered(struct dw_hdmi *hdmi) hdmi_writeb(hdmi, HDMI_PHY_I2CM_CTLINT_ADDR_NAC_POL | HDMI_PHY_I2CM_CTLINT_ADDR_ARBITRATION_POL, HDMI_PHY_I2CM_CTLINT_ADDR); - - /* enable cable hot plug irq */ - hdmi_writeb(hdmi, hdmi->phy_mask, HDMI_PHY_MASK0); - - /* Clear Hotplug interrupts */ - hdmi_writeb(hdmi, HDMI_IH_PHY_STAT0_HPD | HDMI_IH_PHY_STAT0_RX_SENSE, - HDMI_IH_PHY_STAT0); - - return 0; } static void initialize_hdmi_ih_mutes(struct dw_hdmi *hdmi) @@ -1630,6 +1621,26 @@ static void dw_hdmi_update_phy_mask(struct dw_hdmi *hdmi) hdmi_writeb(hdmi, hdmi->phy_mask, HDMI_PHY_MASK0); } +static void dw_hdmi_phy_setup_hpd(struct dw_hdmi *hdmi) +{ + /* + * Configure the PHY RX SENSE and HPD interrupts polarities and clear + * any pending interrupt. + */ + hdmi_writeb(hdmi, HDMI_PHY_HPD | HDMI_PHY_RX_SENSE, HDMI_PHY_POL0); + hdmi_writeb(hdmi, HDMI_IH_PHY_STAT0_HPD | HDMI_IH_PHY_STAT0_RX_SENSE, + HDMI_IH_PHY_STAT0); + + /* Enable cable hot plug irq. */ + hdmi_writeb(hdmi, hdmi->phy_mask, HDMI_PHY_MASK0); + + /* Clear and unmute interrupts. */ + hdmi_writeb(hdmi, HDMI_IH_PHY_STAT0_HPD | HDMI_IH_PHY_STAT0_RX_SENSE, + HDMI_IH_PHY_STAT0); + hdmi_writeb(hdmi, ~(HDMI_IH_PHY_STAT0_HPD | HDMI_IH_PHY_STAT0_RX_SENSE), + HDMI_IH_MUTE_PHY_STAT0); +} + static enum drm_connector_status dw_hdmi_connector_detect(struct drm_connector *connector, bool force) { @@ -2141,29 +2152,14 @@ __dw_hdmi_probe(struct platform_device *pdev, hdmi->ddc = NULL; } - /* - * Configure registers related to HDMI interrupt - * generation before registering IRQ. - */ - hdmi_writeb(hdmi, HDMI_PHY_HPD | HDMI_PHY_RX_SENSE, HDMI_PHY_POL0); - - /* Clear Hotplug interrupts */ - hdmi_writeb(hdmi, HDMI_IH_PHY_STAT0_HPD | HDMI_IH_PHY_STAT0_RX_SENSE, - HDMI_IH_PHY_STAT0); - hdmi->bridge.driver_private = hdmi; hdmi->bridge.funcs = &dw_hdmi_bridge_funcs; #ifdef CONFIG_OF hdmi->bridge.of_node = pdev->dev.of_node; #endif - ret = dw_hdmi_fb_registered(hdmi); - if (ret) - goto err_iahb; - - /* Unmute interrupts */ - hdmi_writeb(hdmi, ~(HDMI_IH_PHY_STAT0_HPD | HDMI_IH_PHY_STAT0_RX_SENSE), - HDMI_IH_MUTE_PHY_STAT0); + dw_hdmi_fb_registered(hdmi); + dw_hdmi_phy_setup_hpd(hdmi); memset(&pdevinfo, 0, sizeof(pdevinfo)); pdevinfo.parent = dev; -- Regards, Laurent Pinchart From mboxrd@z Thu Jan 1 00:00:00 1970 From: Laurent Pinchart Subject: Re: [PATCH v2 2/2] drm: bridge: Move HPD handling to PHY operations Date: Fri, 03 Mar 2017 14:16:58 +0200 Message-ID: <19854660.KZ12oiydRY@avalon> References: <1488468572-31971-1-git-send-email-narmstrong@baylibre.com> <952185cf-16b8-b987-4737-96c2db4a0f6c@baylibre.com> <67b8ac3e-3227-8f32-7f20-0cd4b6d4510f@synopsys.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from galahad.ideasonboard.com (galahad.ideasonboard.com [185.26.127.97]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1DE2F6ECEF for ; Fri, 3 Mar 2017 12:16:26 +0000 (UTC) In-Reply-To: <67b8ac3e-3227-8f32-7f20-0cd4b6d4510f@synopsys.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Jose Abreu Cc: laurent.pinchart+renesas@ideasonboard.com, Neil Armstrong , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, kieran.bingham@ideasonboard.com, linux-amlogic@lists.infradead.org List-Id: dri-devel@lists.freedesktop.org SGkgSm9zZSwKCk9uIEZyaWRheSAwMyBNYXIgMjAxNyAxMDowNTozNiBKb3NlIEFicmV1IHdyb3Rl Ogo+IE9uIDAzLTAzLTIwMTcgMDk6MDcsIE5laWwgQXJtc3Ryb25nIHdyb3RlOgo+ID4gVGhlIHBy b2JsZW0gaXMgdGhhdCB0aGUgSFBEL1J4U2Vuc2UgaXMgdGllZCB0byB0aGlzIHBoeV9tYXNrIGFu ZCBnbHVlZAo+ID4gaW50byB0aGUgZHctaGRtaSBkcml2ZXIuCj4gPiAKPiA+IFRoZSAqcmVhbCog c29sdXRpb24gd291bGQgYmUgdG8gY29tcGxldGVseSBzZXBhcmF0ZSB0aGUgSFBEL1J4U2Vuc2Ug aXJxCj4gPiBoYW5kbGluZyB0byBhIHNlcGFyYXRlIGRyaXZlciBhcyBhIHNoYXJlZCBpcnEuLi4K PiA+IAo+ID4gSWYgSm9zZSBpcyB3aWxsaW5nIHRvIGdpdmUgbWUgc29tZSBkb2N1bWVudGF0aW9u IGFuZCBGcmVlc2NhbGUgc29tZQo+ID4gYm9hcmRzLCBJJ2xsIGJlIGhhcHB5IHRvIGRvIGl0ICEK PiAKPiBIbW0sIHdoeSBkb24ndCBnZXQgcmlkIG9mIHBoeV9tYXNrIHRvdGFsbHkgYW5kIGp1c3Qg cmV0dXJuIHRoZQo+IG5ldyBtYXNrIGluIHVwZGF0ZV9ocGQoKSBmdW5jdGlvbj8gT3IgYWRkIGEg Z2V0X2hwZF9zdGF0dXMoKQo+IGNhbGxiYWNrLiAoSSBhbHNvIHRoaW5rIHRoZXJlIGFyZSB0b28g bWFueSBjYWxsYmFja3MuIEZvciBleGFtcGxlCj4gd2UgY291bGQgaGF2ZTogc2V0dXAsIHNldF9z dGF0dXMsIGNsZWFyIGFuZCB0aGVuIGp1c3QgdXNlCj4gcGFyYW1ldGVycyB3aGVuIG5lZWRlZDoK PiAgICAgdm9pZCBzZXR1cChib29sIGZvcmNlLCBib29sIGRpc2FibGVkLCBib29sIHJ4c2Vuc2Up Cj4gICAgIHZvaWQgc2V0X3N0YXR1cyhib29sIGVuYWJsZSwgYm9vbCBlbmFibGVfaW50cykKPiAg ICAgdm9pZCBjbGVhcigpCj4gCj4gV2hhdCBkbyB5b3UgdGhpbms/IEkgb25seSBjaGVja2VkIHF1 aWNrbHkgdGhlIGNvZGUsIGRvbid0IGtub3cgaWYKPiB0aGlzIGlzIGVub3VnaC4KCkZvciB0aGUg cmVjb3JkLCB0aGF0J3MgbW9yZSBvciBsZXNzIHdoYXQgSSBoYWQgaW4gbWluZC4gVGhlIGZvbGxv d2luZwpwcmVwYXJhdG9yeSBwYXRjaCBjb3VsZCBiZSB1c2VmdWwuCgpjb21taXQgNWNlYjZhOTNk NzhlMjFlNWJlMTk1ZWZlNTJjNGM3ZTU1NzhhYzc4NwpBdXRob3I6IExhdXJlbnQgUGluY2hhcnQg PGxhdXJlbnQucGluY2hhcnQrcmVuZXNhc0BpZGVhc29uYm9hcmQuY29tPgpEYXRlOiAgIEZyaSBN YXIgMyAxNDoxNDo1NiAyMDE3ICswMjAwCgogICAgZHJtOiBicmlkZ2U6IGR3LWhkbWk6IEV4dHJh Y3QgUEhZIGludGVycnVwdCBzZXR1cCB0byBhIGZ1bmN0aW9uCiAgICAKICAgIEluIHByZXBhcmF0 aW9uIGZvciBhZGRpbmcgUEhZIG9wZXJhdGlvbnMgdG8gaGFuZGxlIFJYIFNFTlNFIGFuZCBIUEQs CiAgICBncm91cCBhbGwgdGhlIFBIWSBpbnRlcnJ1cHQgc2V0dXAgY29kZSBpbiBhIHNpbmdsZSBs b2NhdGlvbiBhbmQgZXh0cmFjdAogICAgaXQgdG8gYSBzZXBhcmF0ZSBmdW5jdGlvbi4KICAgIAog ICAgU2lnbmVkLW9mZi1ieTogTGF1cmVudCBQaW5jaGFydCA8bGF1cmVudC5waW5jaGFydCtyZW5l c2FzQGlkZWFzb25ib2FyZC5jb20+CgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2JyaWRn ZS9kdy1oZG1pLmMgYi9kcml2ZXJzL2dwdS9kcm0vYnJpZGdlL2R3LWhkbWkuYwppbmRleCAwMjZh MGRjZTc2NjEuLjFlZDhiYzEyZWVkNyAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2JyaWRn ZS9kdy1oZG1pLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL2JyaWRnZS9kdy1oZG1pLmMKQEAgLTE0 OTYsNyArMTQ5Niw3IEBAIHN0YXRpYyBpbnQgZHdfaGRtaV9zZXR1cChzdHJ1Y3QgZHdfaGRtaSAq aGRtaSwgc3RydWN0IGRybV9kaXNwbGF5X21vZGUgKm1vZGUpCiB9CiAKIC8qIFdhaXQgdW50aWwg d2UgYXJlIHJlZ2lzdGVyZWQgdG8gZW5hYmxlIGludGVycnVwdHMgKi8KLXN0YXRpYyBpbnQgZHdf aGRtaV9mYl9yZWdpc3RlcmVkKHN0cnVjdCBkd19oZG1pICpoZG1pKQorc3RhdGljIHZvaWQgZHdf aGRtaV9mYl9yZWdpc3RlcmVkKHN0cnVjdCBkd19oZG1pICpoZG1pKQogewogCWhkbWlfd3JpdGVi KGhkbWksIEhETUlfUEhZX0kyQ01fSU5UX0FERFJfRE9ORV9QT0wsCiAJCSAgICBIRE1JX1BIWV9J MkNNX0lOVF9BRERSKTsKQEAgLTE1MDQsMTUgKzE1MDQsNiBAQCBzdGF0aWMgaW50IGR3X2hkbWlf ZmJfcmVnaXN0ZXJlZChzdHJ1Y3QgZHdfaGRtaSAqaGRtaSkKIAloZG1pX3dyaXRlYihoZG1pLCBI RE1JX1BIWV9JMkNNX0NUTElOVF9BRERSX05BQ19QT0wgfAogCQkgICAgSERNSV9QSFlfSTJDTV9D VExJTlRfQUREUl9BUkJJVFJBVElPTl9QT0wsCiAJCSAgICBIRE1JX1BIWV9JMkNNX0NUTElOVF9B RERSKTsKLQotCS8qIGVuYWJsZSBjYWJsZSBob3QgcGx1ZyBpcnEgKi8KLQloZG1pX3dyaXRlYiho ZG1pLCBoZG1pLT5waHlfbWFzaywgSERNSV9QSFlfTUFTSzApOwotCi0JLyogQ2xlYXIgSG90cGx1 ZyBpbnRlcnJ1cHRzICovCi0JaGRtaV93cml0ZWIoaGRtaSwgSERNSV9JSF9QSFlfU1RBVDBfSFBE IHwgSERNSV9JSF9QSFlfU1RBVDBfUlhfU0VOU0UsCi0JCSAgICBIRE1JX0lIX1BIWV9TVEFUMCk7 Ci0KLQlyZXR1cm4gMDsKIH0KIAogc3RhdGljIHZvaWQgaW5pdGlhbGl6ZV9oZG1pX2loX211dGVz KHN0cnVjdCBkd19oZG1pICpoZG1pKQpAQCAtMTYzMCw2ICsxNjIxLDI2IEBAIHN0YXRpYyB2b2lk IGR3X2hkbWlfdXBkYXRlX3BoeV9tYXNrKHN0cnVjdCBkd19oZG1pICpoZG1pKQogCQloZG1pX3dy aXRlYihoZG1pLCBoZG1pLT5waHlfbWFzaywgSERNSV9QSFlfTUFTSzApOwogfQogCitzdGF0aWMg dm9pZCBkd19oZG1pX3BoeV9zZXR1cF9ocGQoc3RydWN0IGR3X2hkbWkgKmhkbWkpCit7CisJLyoK KwkgKiBDb25maWd1cmUgdGhlIFBIWSBSWCBTRU5TRSBhbmQgSFBEIGludGVycnVwdHMgcG9sYXJp dGllcyBhbmQgY2xlYXIKKwkgKiBhbnkgcGVuZGluZyBpbnRlcnJ1cHQuCisJICovCisJaGRtaV93 cml0ZWIoaGRtaSwgSERNSV9QSFlfSFBEIHwgSERNSV9QSFlfUlhfU0VOU0UsIEhETUlfUEhZX1BP TDApOworCWhkbWlfd3JpdGViKGhkbWksIEhETUlfSUhfUEhZX1NUQVQwX0hQRCB8IEhETUlfSUhf UEhZX1NUQVQwX1JYX1NFTlNFLAorCQkgICAgSERNSV9JSF9QSFlfU1RBVDApOworCisJLyogRW5h YmxlIGNhYmxlIGhvdCBwbHVnIGlycS4gKi8KKwloZG1pX3dyaXRlYihoZG1pLCBoZG1pLT5waHlf bWFzaywgSERNSV9QSFlfTUFTSzApOworCisJLyogQ2xlYXIgYW5kIHVubXV0ZSBpbnRlcnJ1cHRz LiAqLworCWhkbWlfd3JpdGViKGhkbWksIEhETUlfSUhfUEhZX1NUQVQwX0hQRCB8IEhETUlfSUhf UEhZX1NUQVQwX1JYX1NFTlNFLAorCQkgICAgSERNSV9JSF9QSFlfU1RBVDApOworCWhkbWlfd3Jp dGViKGhkbWksIH4oSERNSV9JSF9QSFlfU1RBVDBfSFBEIHwgSERNSV9JSF9QSFlfU1RBVDBfUlhf U0VOU0UpLAorCQkgICAgSERNSV9JSF9NVVRFX1BIWV9TVEFUMCk7Cit9CisKIHN0YXRpYyBlbnVt IGRybV9jb25uZWN0b3Jfc3RhdHVzCiBkd19oZG1pX2Nvbm5lY3Rvcl9kZXRlY3Qoc3RydWN0IGRy bV9jb25uZWN0b3IgKmNvbm5lY3RvciwgYm9vbCBmb3JjZSkKIHsKQEAgLTIxNDEsMjkgKzIxNTIs MTQgQEAgX19kd19oZG1pX3Byb2JlKHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKnBkZXYsCiAJCQlo ZG1pLT5kZGMgPSBOVUxMOwogCX0KIAotCS8qCi0JICogQ29uZmlndXJlIHJlZ2lzdGVycyByZWxh dGVkIHRvIEhETUkgaW50ZXJydXB0Ci0JICogZ2VuZXJhdGlvbiBiZWZvcmUgcmVnaXN0ZXJpbmcg SVJRLgotCSAqLwotCWhkbWlfd3JpdGViKGhkbWksIEhETUlfUEhZX0hQRCB8IEhETUlfUEhZX1JY X1NFTlNFLCBIRE1JX1BIWV9QT0wwKTsKLQotCS8qIENsZWFyIEhvdHBsdWcgaW50ZXJydXB0cyAq LwotCWhkbWlfd3JpdGViKGhkbWksIEhETUlfSUhfUEhZX1NUQVQwX0hQRCB8IEhETUlfSUhfUEhZ X1NUQVQwX1JYX1NFTlNFLAotCQkgICAgSERNSV9JSF9QSFlfU1RBVDApOwotCiAJaGRtaS0+YnJp ZGdlLmRyaXZlcl9wcml2YXRlID0gaGRtaTsKIAloZG1pLT5icmlkZ2UuZnVuY3MgPSAmZHdfaGRt aV9icmlkZ2VfZnVuY3M7CiAjaWZkZWYgQ09ORklHX09GCiAJaGRtaS0+YnJpZGdlLm9mX25vZGUg PSBwZGV2LT5kZXYub2Zfbm9kZTsKICNlbmRpZgogCi0JcmV0ID0gZHdfaGRtaV9mYl9yZWdpc3Rl cmVkKGhkbWkpOwotCWlmIChyZXQpCi0JCWdvdG8gZXJyX2lhaGI7Ci0KLQkvKiBVbm11dGUgaW50 ZXJydXB0cyAqLwotCWhkbWlfd3JpdGViKGhkbWksIH4oSERNSV9JSF9QSFlfU1RBVDBfSFBEIHwg SERNSV9JSF9QSFlfU1RBVDBfUlhfU0VOU0UpLAotCQkgICAgSERNSV9JSF9NVVRFX1BIWV9TVEFU MCk7CisJZHdfaGRtaV9mYl9yZWdpc3RlcmVkKGhkbWkpOworCWR3X2hkbWlfcGh5X3NldHVwX2hw ZChoZG1pKTsKIAogCW1lbXNldCgmcGRldmluZm8sIDAsIHNpemVvZihwZGV2aW5mbykpOwogCXBk ZXZpbmZvLnBhcmVudCA9IGRldjsKCgotLSAKUmVnYXJkcywKCkxhdXJlbnQgUGluY2hhcnQKCl9f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1kZXZlbCBt YWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3Rz LmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751823AbdCCNET (ORCPT ); Fri, 3 Mar 2017 08:04:19 -0500 Received: from galahad.ideasonboard.com ([185.26.127.97]:38606 "EHLO galahad.ideasonboard.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751545AbdCCNEQ (ORCPT ); Fri, 3 Mar 2017 08:04:16 -0500 From: Laurent Pinchart To: Jose Abreu Cc: Neil Armstrong , dri-devel@lists.freedesktop.org, laurent.pinchart+renesas@ideasonboard.com, kieran.bingham@ideasonboard.com, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2 2/2] drm: bridge: Move HPD handling to PHY operations Date: Fri, 03 Mar 2017 14:16:58 +0200 Message-ID: <19854660.KZ12oiydRY@avalon> User-Agent: KMail/4.14.10 (Linux/4.9.6-gentoo-r1; KDE/4.14.28; x86_64; ; ) In-Reply-To: <67b8ac3e-3227-8f32-7f20-0cd4b6d4510f@synopsys.com> References: <1488468572-31971-1-git-send-email-narmstrong@baylibre.com> <952185cf-16b8-b987-4737-96c2db4a0f6c@baylibre.com> <67b8ac3e-3227-8f32-7f20-0cd4b6d4510f@synopsys.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Jose, On Friday 03 Mar 2017 10:05:36 Jose Abreu wrote: > On 03-03-2017 09:07, Neil Armstrong wrote: > > The problem is that the HPD/RxSense is tied to this phy_mask and glued > > into the dw-hdmi driver. > > > > The *real* solution would be to completely separate the HPD/RxSense irq > > handling to a separate driver as a shared irq... > > > > If Jose is willing to give me some documentation and Freescale some > > boards, I'll be happy to do it ! > > Hmm, why don't get rid of phy_mask totally and just return the > new mask in update_hpd() function? Or add a get_hpd_status() > callback. (I also think there are too many callbacks. For example > we could have: setup, set_status, clear and then just use > parameters when needed: > void setup(bool force, bool disabled, bool rxsense) > void set_status(bool enable, bool enable_ints) > void clear() > > What do you think? I only checked quickly the code, don't know if > this is enough. For the record, that's more or less what I had in mind. The following preparatory patch could be useful. commit 5ceb6a93d78e21e5be195efe52c4c7e5578ac787 Author: Laurent Pinchart Date: Fri Mar 3 14:14:56 2017 +0200 drm: bridge: dw-hdmi: Extract PHY interrupt setup to a function In preparation for adding PHY operations to handle RX SENSE and HPD, group all the PHY interrupt setup code in a single location and extract it to a separate function. Signed-off-by: Laurent Pinchart diff --git a/drivers/gpu/drm/bridge/dw-hdmi.c b/drivers/gpu/drm/bridge/dw-hdmi.c index 026a0dce7661..1ed8bc12eed7 100644 --- a/drivers/gpu/drm/bridge/dw-hdmi.c +++ b/drivers/gpu/drm/bridge/dw-hdmi.c @@ -1496,7 +1496,7 @@ static int dw_hdmi_setup(struct dw_hdmi *hdmi, struct drm_display_mode *mode) } /* Wait until we are registered to enable interrupts */ -static int dw_hdmi_fb_registered(struct dw_hdmi *hdmi) +static void dw_hdmi_fb_registered(struct dw_hdmi *hdmi) { hdmi_writeb(hdmi, HDMI_PHY_I2CM_INT_ADDR_DONE_POL, HDMI_PHY_I2CM_INT_ADDR); @@ -1504,15 +1504,6 @@ static int dw_hdmi_fb_registered(struct dw_hdmi *hdmi) hdmi_writeb(hdmi, HDMI_PHY_I2CM_CTLINT_ADDR_NAC_POL | HDMI_PHY_I2CM_CTLINT_ADDR_ARBITRATION_POL, HDMI_PHY_I2CM_CTLINT_ADDR); - - /* enable cable hot plug irq */ - hdmi_writeb(hdmi, hdmi->phy_mask, HDMI_PHY_MASK0); - - /* Clear Hotplug interrupts */ - hdmi_writeb(hdmi, HDMI_IH_PHY_STAT0_HPD | HDMI_IH_PHY_STAT0_RX_SENSE, - HDMI_IH_PHY_STAT0); - - return 0; } static void initialize_hdmi_ih_mutes(struct dw_hdmi *hdmi) @@ -1630,6 +1621,26 @@ static void dw_hdmi_update_phy_mask(struct dw_hdmi *hdmi) hdmi_writeb(hdmi, hdmi->phy_mask, HDMI_PHY_MASK0); } +static void dw_hdmi_phy_setup_hpd(struct dw_hdmi *hdmi) +{ + /* + * Configure the PHY RX SENSE and HPD interrupts polarities and clear + * any pending interrupt. + */ + hdmi_writeb(hdmi, HDMI_PHY_HPD | HDMI_PHY_RX_SENSE, HDMI_PHY_POL0); + hdmi_writeb(hdmi, HDMI_IH_PHY_STAT0_HPD | HDMI_IH_PHY_STAT0_RX_SENSE, + HDMI_IH_PHY_STAT0); + + /* Enable cable hot plug irq. */ + hdmi_writeb(hdmi, hdmi->phy_mask, HDMI_PHY_MASK0); + + /* Clear and unmute interrupts. */ + hdmi_writeb(hdmi, HDMI_IH_PHY_STAT0_HPD | HDMI_IH_PHY_STAT0_RX_SENSE, + HDMI_IH_PHY_STAT0); + hdmi_writeb(hdmi, ~(HDMI_IH_PHY_STAT0_HPD | HDMI_IH_PHY_STAT0_RX_SENSE), + HDMI_IH_MUTE_PHY_STAT0); +} + static enum drm_connector_status dw_hdmi_connector_detect(struct drm_connector *connector, bool force) { @@ -2141,29 +2152,14 @@ __dw_hdmi_probe(struct platform_device *pdev, hdmi->ddc = NULL; } - /* - * Configure registers related to HDMI interrupt - * generation before registering IRQ. - */ - hdmi_writeb(hdmi, HDMI_PHY_HPD | HDMI_PHY_RX_SENSE, HDMI_PHY_POL0); - - /* Clear Hotplug interrupts */ - hdmi_writeb(hdmi, HDMI_IH_PHY_STAT0_HPD | HDMI_IH_PHY_STAT0_RX_SENSE, - HDMI_IH_PHY_STAT0); - hdmi->bridge.driver_private = hdmi; hdmi->bridge.funcs = &dw_hdmi_bridge_funcs; #ifdef CONFIG_OF hdmi->bridge.of_node = pdev->dev.of_node; #endif - ret = dw_hdmi_fb_registered(hdmi); - if (ret) - goto err_iahb; - - /* Unmute interrupts */ - hdmi_writeb(hdmi, ~(HDMI_IH_PHY_STAT0_HPD | HDMI_IH_PHY_STAT0_RX_SENSE), - HDMI_IH_MUTE_PHY_STAT0); + dw_hdmi_fb_registered(hdmi); + dw_hdmi_phy_setup_hpd(hdmi); memset(&pdevinfo, 0, sizeof(pdevinfo)); pdevinfo.parent = dev; -- Regards, Laurent Pinchart