From patchwork Mon Jan 2 14:19:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans Verkuil X-Patchwork-Id: 9493695 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4A29F60414 for ; Mon, 2 Jan 2017 14:19:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3E5F120008 for ; Mon, 2 Jan 2017 14:19:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3304B268AE; Mon, 2 Jan 2017 14:19:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BBBC0223B2 for ; Mon, 2 Jan 2017 14:19:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933061AbdABOTX (ORCPT ); Mon, 2 Jan 2017 09:19:23 -0500 Received: from lb1-smtp-cloud6.xs4all.net ([194.109.24.24]:59457 "EHLO lb1-smtp-cloud6.xs4all.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932997AbdABOTW (ORCPT ); Mon, 2 Jan 2017 09:19:22 -0500 Received: from tschai.lan ([46.9.235.119]) by smtp-cloud6.xs4all.net with ESMTP id TSKF1u00c2bEJta01SKLiK; Mon, 02 Jan 2017 15:19:21 +0100 Received: from tschai.fritz.box (localhost [127.0.0.1]) by tschai.lan (Postfix) with ESMTPSA id E7F6318234B; Mon, 2 Jan 2017 15:19:07 +0100 (CET) From: Hans Verkuil To: linux-media@vger.kernel.org Cc: Russell King , dri-devel@lists.freedesktop.org, Marek Szyprowski , Javier Martinez Canillas , Benjamin Gaignard , linux-samsung-soc@vger.kernel.org, Krzysztof Kozlowski , Inki Dae , Hans Verkuil Subject: [PATCHv2 2/4] exynos_hdmi: add HPD notifier support Date: Mon, 2 Jan 2017 15:19:05 +0100 Message-Id: <1483366747-34288-3-git-send-email-hverkuil@xs4all.nl> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1483366747-34288-1-git-send-email-hverkuil@xs4all.nl> References: <1483366747-34288-1-git-send-email-hverkuil@xs4all.nl> Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Hans Verkuil Implement the HPD notifier support to allow CEC drivers to be informed when there is a new EDID and when a connect or disconnect happens. Signed-off-by: Hans Verkuil Tested-by: Marek Szyprowski --- drivers/gpu/drm/exynos/Kconfig | 1 + drivers/gpu/drm/exynos/exynos_hdmi.c | 24 +++++++++++++++++++++--- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/exynos/Kconfig b/drivers/gpu/drm/exynos/Kconfig index d706ca4..80bfd1d 100644 --- a/drivers/gpu/drm/exynos/Kconfig +++ b/drivers/gpu/drm/exynos/Kconfig @@ -77,6 +77,7 @@ config DRM_EXYNOS_DP config DRM_EXYNOS_HDMI bool "HDMI" depends on DRM_EXYNOS_MIXER || DRM_EXYNOS5433_DECON + select HPD_NOTIFIERS help Choose this option if you want to use Exynos HDMI for DRM. diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c index 5ed8b1e..28bf609 100644 --- a/drivers/gpu/drm/exynos/exynos_hdmi.c +++ b/drivers/gpu/drm/exynos/exynos_hdmi.c @@ -31,6 +31,7 @@ #include #include #include +#include #include #include #include @@ -118,6 +119,7 @@ struct hdmi_context { bool dvi_mode; struct delayed_work hotplug_work; struct drm_display_mode current_mode; + struct hpd_notifier *notifier; const struct hdmi_driver_data *drv_data; void __iomem *regs; @@ -807,9 +809,12 @@ static enum drm_connector_status hdmi_detect(struct drm_connector *connector, { struct hdmi_context *hdata = connector_to_hdmi(connector); - if (gpiod_get_value(hdata->hpd_gpio)) + if (gpiod_get_value(hdata->hpd_gpio)) { + hpd_event_connect(hdata->notifier); return connector_status_connected; + } + hpd_event_disconnect(hdata->notifier); return connector_status_disconnected; } @@ -848,6 +853,9 @@ static int hdmi_get_modes(struct drm_connector *connector) edid->width_cm, edid->height_cm); drm_mode_connector_update_edid_property(connector, edid); + hpd_event_connect(hdata->notifier); + hpd_event_new_edid(hdata->notifier, edid, + EDID_LENGTH * (1 + edid->extensions)); ret = drm_add_edid_modes(connector, edid); @@ -1483,6 +1491,7 @@ static void hdmi_disable(struct drm_encoder *encoder) if (funcs && funcs->disable) (*funcs->disable)(crtc); + hpd_event_disconnect(hdata->notifier); cancel_delayed_work(&hdata->hotplug_work); hdmiphy_disable(hdata); @@ -1832,15 +1841,22 @@ static int hdmi_probe(struct platform_device *pdev) } } + hdata->notifier = hpd_notifier_get(&pdev->dev); + if (hdata->notifier == NULL) { + ret = -ENOMEM; + goto err_hdmiphy; + } + pm_runtime_enable(dev); ret = component_add(&pdev->dev, &hdmi_component_ops); if (ret) - goto err_disable_pm_runtime; + goto err_notifier_put; return ret; -err_disable_pm_runtime: +err_notifier_put: + hpd_notifier_put(hdata->notifier); pm_runtime_disable(dev); err_hdmiphy: @@ -1859,9 +1875,11 @@ static int hdmi_remove(struct platform_device *pdev) struct hdmi_context *hdata = platform_get_drvdata(pdev); cancel_delayed_work_sync(&hdata->hotplug_work); + hpd_event_disconnect(hdata->notifier); component_del(&pdev->dev, &hdmi_component_ops); + hpd_notifier_put(hdata->notifier); pm_runtime_disable(&pdev->dev); if (!IS_ERR(hdata->reg_hdmi_en))