From mboxrd@z Thu Jan 1 00:00:00 1970 From: Russell King Date: Fri, 12 Aug 2016 14:15:05 +0000 Subject: [PATCH RFC 3/5] drm/bridge: dw_hdmi: add HDMI notifier support Message-Id: List-Id: References: <20160812141421.GB1041@n2100.armlinux.org.uk> In-Reply-To: <20160812141421.GB1041@n2100.armlinux.org.uk> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: David Airlie , Jean-Christophe Plagniol-Villard , Tomi Valkeinen , Hans Verkuil Cc: linux-fbdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, dri-devel@lists.freedesktop.org Add HDMI notifiers to the HDMI bridge driver. Signed-off-by: Russell King --- drivers/gpu/drm/bridge/Kconfig | 1 + drivers/gpu/drm/bridge/dw-hdmi.c | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/drivers/gpu/drm/bridge/Kconfig b/drivers/gpu/drm/bridge/Kconfig index 8f7423f18da5..6d97d9f2b164 100644 --- a/drivers/gpu/drm/bridge/Kconfig +++ b/drivers/gpu/drm/bridge/Kconfig @@ -20,6 +20,7 @@ config DRM_ANALOGIX_ANX78XX config DRM_DW_HDMI tristate select DRM_KMS_HELPER + select HDMI_NOTIFIERS config DRM_DW_HDMI_AHB_AUDIO tristate "Synopsis Designware AHB Audio interface" diff --git a/drivers/gpu/drm/bridge/dw-hdmi.c b/drivers/gpu/drm/bridge/dw-hdmi.c index c9d941283d30..cb6e03efbebf 100644 --- a/drivers/gpu/drm/bridge/dw-hdmi.c +++ b/drivers/gpu/drm/bridge/dw-hdmi.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include #include @@ -1447,9 +1448,11 @@ static int dw_hdmi_connector_get_modes(struct drm_connector *connector) 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); + hdmi_event_new_edid(hdmi->dev, edid, 0); ret = drm_add_edid_modes(connector, edid); /* Store the ELD */ drm_edid_to_eld(connector, edid); + hdmi_event_new_eld(hdmi->dev, connector->eld); kfree(edid); } else { dev_dbg(hdmi->dev, "failed to get edid\n"); @@ -1601,6 +1604,12 @@ static irqreturn_t dw_hdmi_irq(int irq, void *dev_id) dw_hdmi_update_phy_mask(hdmi); } mutex_unlock(&hdmi->mutex); + + if ((phy_stat & (HDMI_PHY_RX_SENSE | HDMI_PHY_HPD)) = 0) + hdmi_event_disconnect(hdmi->dev); + else if ((phy_stat & (HDMI_PHY_RX_SENSE | HDMI_PHY_HPD)) = + (HDMI_IH_PHY_STAT0_RX_SENSE | HDMI_PHY_HPD)) + hdmi_event_connect(hdmi->dev); } if (intr_stat & HDMI_IH_PHY_STAT0_HPD) { -- 2.1.0 From mboxrd@z Thu Jan 1 00:00:00 1970 From: rmk+kernel@arm.linux.org.uk (Russell King) Date: Fri, 12 Aug 2016 15:15:05 +0100 Subject: [PATCH RFC 3/5] drm/bridge: dw_hdmi: add HDMI notifier support In-Reply-To: <20160812141421.GB1041@n2100.armlinux.org.uk> References: <20160812141421.GB1041@n2100.armlinux.org.uk> Message-ID: To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Add HDMI notifiers to the HDMI bridge driver. Signed-off-by: Russell King --- drivers/gpu/drm/bridge/Kconfig | 1 + drivers/gpu/drm/bridge/dw-hdmi.c | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/drivers/gpu/drm/bridge/Kconfig b/drivers/gpu/drm/bridge/Kconfig index 8f7423f18da5..6d97d9f2b164 100644 --- a/drivers/gpu/drm/bridge/Kconfig +++ b/drivers/gpu/drm/bridge/Kconfig @@ -20,6 +20,7 @@ config DRM_ANALOGIX_ANX78XX config DRM_DW_HDMI tristate select DRM_KMS_HELPER + select HDMI_NOTIFIERS config DRM_DW_HDMI_AHB_AUDIO tristate "Synopsis Designware AHB Audio interface" diff --git a/drivers/gpu/drm/bridge/dw-hdmi.c b/drivers/gpu/drm/bridge/dw-hdmi.c index c9d941283d30..cb6e03efbebf 100644 --- a/drivers/gpu/drm/bridge/dw-hdmi.c +++ b/drivers/gpu/drm/bridge/dw-hdmi.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include #include @@ -1447,9 +1448,11 @@ static int dw_hdmi_connector_get_modes(struct drm_connector *connector) 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); + hdmi_event_new_edid(hdmi->dev, edid, 0); ret = drm_add_edid_modes(connector, edid); /* Store the ELD */ drm_edid_to_eld(connector, edid); + hdmi_event_new_eld(hdmi->dev, connector->eld); kfree(edid); } else { dev_dbg(hdmi->dev, "failed to get edid\n"); @@ -1601,6 +1604,12 @@ static irqreturn_t dw_hdmi_irq(int irq, void *dev_id) dw_hdmi_update_phy_mask(hdmi); } mutex_unlock(&hdmi->mutex); + + if ((phy_stat & (HDMI_PHY_RX_SENSE | HDMI_PHY_HPD)) == 0) + hdmi_event_disconnect(hdmi->dev); + else if ((phy_stat & (HDMI_PHY_RX_SENSE | HDMI_PHY_HPD)) == + (HDMI_IH_PHY_STAT0_RX_SENSE | HDMI_PHY_HPD)) + hdmi_event_connect(hdmi->dev); } if (intr_stat & HDMI_IH_PHY_STAT0_HPD) { -- 2.1.0 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Russell King Subject: [PATCH RFC 3/5] drm/bridge: dw_hdmi: add HDMI notifier support Date: Fri, 12 Aug 2016 15:15:05 +0100 Message-ID: References: <20160812141421.GB1041@n2100.armlinux.org.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from pandora.armlinux.org.uk (pandora.armlinux.org.uk [IPv6:2001:4d48:ad52:3201:214:fdff:fe10:1be6]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2F5006EBC4 for ; Fri, 12 Aug 2016 14:15:25 +0000 (UTC) In-Reply-To: <20160812141421.GB1041@n2100.armlinux.org.uk> Content-Disposition: inline List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: David Airlie , Jean-Christophe Plagniol-Villard , Tomi Valkeinen , Hans Verkuil Cc: linux-fbdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org QWRkIEhETUkgbm90aWZpZXJzIHRvIHRoZSBIRE1JIGJyaWRnZSBkcml2ZXIuCgpTaWduZWQtb2Zm LWJ5OiBSdXNzZWxsIEtpbmcgPHJtaytrZXJuZWxAYXJtLmxpbnV4Lm9yZy51az4KLS0tCiBkcml2 ZXJzL2dwdS9kcm0vYnJpZGdlL0tjb25maWcgICB8IDEgKwogZHJpdmVycy9ncHUvZHJtL2JyaWRn ZS9kdy1oZG1pLmMgfCA5ICsrKysrKysrKwogMiBmaWxlcyBjaGFuZ2VkLCAxMCBpbnNlcnRpb25z KCspCgpkaWZmIC0tZ2l0IGEvZHJpdmVycy9ncHUvZHJtL2JyaWRnZS9LY29uZmlnIGIvZHJpdmVy cy9ncHUvZHJtL2JyaWRnZS9LY29uZmlnCmluZGV4IDhmNzQyM2YxOGRhNS4uNmQ5N2Q5ZjJiMTY0 IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYnJpZGdlL0tjb25maWcKKysrIGIvZHJpdmVy cy9ncHUvZHJtL2JyaWRnZS9LY29uZmlnCkBAIC0yMCw2ICsyMCw3IEBAIGNvbmZpZyBEUk1fQU5B TE9HSVhfQU5YNzhYWAogY29uZmlnIERSTV9EV19IRE1JCiAJdHJpc3RhdGUKIAlzZWxlY3QgRFJN X0tNU19IRUxQRVIKKwlzZWxlY3QgSERNSV9OT1RJRklFUlMKIAogY29uZmlnIERSTV9EV19IRE1J X0FIQl9BVURJTwogCXRyaXN0YXRlICJTeW5vcHNpcyBEZXNpZ253YXJlIEFIQiBBdWRpbyBpbnRl cmZhY2UiCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vYnJpZGdlL2R3LWhkbWkuYyBiL2Ry aXZlcnMvZ3B1L2RybS9icmlkZ2UvZHctaGRtaS5jCmluZGV4IGM5ZDk0MTI4M2QzMC4uY2I2ZTAz ZWZiZWJmIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwdS9kcm0vYnJpZGdlL2R3LWhkbWkuYworKysg Yi9kcml2ZXJzL2dwdS9kcm0vYnJpZGdlL2R3LWhkbWkuYwpAQCAtMTYsNiArMTYsNyBAQAogI2lu Y2x1ZGUgPGxpbnV4L2Vyci5oPgogI2luY2x1ZGUgPGxpbnV4L2Nsay5oPgogI2luY2x1ZGUgPGxp bnV4L2hkbWkuaD4KKyNpbmNsdWRlIDxsaW51eC9oZG1pLW5vdGlmaWVyLmg+CiAjaW5jbHVkZSA8 bGludXgvbXV0ZXguaD4KICNpbmNsdWRlIDxsaW51eC9vZl9kZXZpY2UuaD4KICNpbmNsdWRlIDxs aW51eC9zcGlubG9jay5oPgpAQCAtMTQ0Nyw5ICsxNDQ4LDExIEBAIHN0YXRpYyBpbnQgZHdfaGRt aV9jb25uZWN0b3JfZ2V0X21vZGVzKHN0cnVjdCBkcm1fY29ubmVjdG9yICpjb25uZWN0b3IpCiAJ CWhkbWktPnNpbmtfaXNfaGRtaSA9IGRybV9kZXRlY3RfaGRtaV9tb25pdG9yKGVkaWQpOwogCQlo ZG1pLT5zaW5rX2hhc19hdWRpbyA9IGRybV9kZXRlY3RfbW9uaXRvcl9hdWRpbyhlZGlkKTsKIAkJ ZHJtX21vZGVfY29ubmVjdG9yX3VwZGF0ZV9lZGlkX3Byb3BlcnR5KGNvbm5lY3RvciwgZWRpZCk7 CisJCWhkbWlfZXZlbnRfbmV3X2VkaWQoaGRtaS0+ZGV2LCBlZGlkLCAwKTsKIAkJcmV0ID0gZHJt X2FkZF9lZGlkX21vZGVzKGNvbm5lY3RvciwgZWRpZCk7CiAJCS8qIFN0b3JlIHRoZSBFTEQgKi8K IAkJZHJtX2VkaWRfdG9fZWxkKGNvbm5lY3RvciwgZWRpZCk7CisJCWhkbWlfZXZlbnRfbmV3X2Vs ZChoZG1pLT5kZXYsIGNvbm5lY3Rvci0+ZWxkKTsKIAkJa2ZyZWUoZWRpZCk7CiAJfSBlbHNlIHsK IAkJZGV2X2RiZyhoZG1pLT5kZXYsICJmYWlsZWQgdG8gZ2V0IGVkaWRcbiIpOwpAQCAtMTYwMSw2 ICsxNjA0LDEyIEBAIHN0YXRpYyBpcnFyZXR1cm5fdCBkd19oZG1pX2lycShpbnQgaXJxLCB2b2lk ICpkZXZfaWQpCiAJCQlkd19oZG1pX3VwZGF0ZV9waHlfbWFzayhoZG1pKTsKIAkJfQogCQltdXRl eF91bmxvY2soJmhkbWktPm11dGV4KTsKKworCQlpZiAoKHBoeV9zdGF0ICYgKEhETUlfUEhZX1JY X1NFTlNFIHwgSERNSV9QSFlfSFBEKSkgPT0gMCkKKwkJCWhkbWlfZXZlbnRfZGlzY29ubmVjdCho ZG1pLT5kZXYpOworCQllbHNlIGlmICgocGh5X3N0YXQgJiAoSERNSV9QSFlfUlhfU0VOU0UgfCBI RE1JX1BIWV9IUEQpKSA9PQorCQkJIChIRE1JX0lIX1BIWV9TVEFUMF9SWF9TRU5TRSB8IEhETUlf UEhZX0hQRCkpCisJCQloZG1pX2V2ZW50X2Nvbm5lY3QoaGRtaS0+ZGV2KTsKIAl9CiAKIAlpZiAo aW50cl9zdGF0ICYgSERNSV9JSF9QSFlfU1RBVDBfSFBEKSB7Ci0tIAoyLjEuMAoKX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcg bGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRl c2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg==