From patchwork Thu Jul 6 10:33:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 9828001 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 0E5B7602BD for ; Thu, 6 Jul 2017 10:33:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E904B285EB for ; Thu, 6 Jul 2017 10:33:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DD13328600; Thu, 6 Jul 2017 10:33:24 +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=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 310D8285EB for ; Thu, 6 Jul 2017 10:33:23 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3C38C6E328; Thu, 6 Jul 2017 10:33:23 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr0-x236.google.com (mail-wr0-x236.google.com [IPv6:2a00:1450:400c:c0c::236]) by gabe.freedesktop.org (Postfix) with ESMTPS id A7DD86E328 for ; Thu, 6 Jul 2017 10:33:21 +0000 (UTC) Received: by mail-wr0-x236.google.com with SMTP id k67so22806059wrc.2 for ; Thu, 06 Jul 2017 03:33:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=qTy6bwVRTroiULujM+g1+02gZo5BVVNlhbTgTaYGjHE=; b=ONPub/4m0myoAZn2mGOIX7dCybQa/vCcFEEBa45EbnPmyMWGIpS8oIfu4CCvG/II59 s0TKoqUFfjK4o2k+4DTQ0hmREBycifZ46LT2SkuzZkffS2asok9QptYGHQcI3mCvaNdn BxlmrdvPiIVZUSa1sPoNKrQPhGa1NMF6pCDE4elxChyNX4XGkBIEGQaosvGl70Rmam81 lKbkXL05qBt6Q1DMyn01w3npOB/CyzwswQlBjX7DbMq6y3FN1DT8bm2qZ9HPnuIubgi8 uA1qhmmMVrYUySs2WPlHICytWsEN7K7H7vP36++SW8FRgLes8ffnlD71kZoZpwuBJrch 6YEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=qTy6bwVRTroiULujM+g1+02gZo5BVVNlhbTgTaYGjHE=; b=uY1r4nmpjVjs7K12+GbpcU623MGSsGIlFCp2BpSSP5PD2NqbKu6T6LZr2Dh5mFZiru +tATDyGo4PQwJiQzZcP1flxTWvUJtS+MnYj2FGzt8lE9YN8UAEPjEU9PVWifZNpKUKX+ 5ErkNoXBZWZeUPi+6ogq+8Lxys8O1z3mlnmlg61w+gXMv3F/MHv/5IQ/yiSPfrve1FC+ iItjHCI/VfB5zdozP0ngnDx7XgfTEjxCxlYgp3dCi2AfK1QEqhMSkDAeecqadZhQJAF/ icSzOzpxP8nA0OpzwR8DOEFPizAQ9ebEyVACIsc52J7R7XBJoNOCnWBHjs7bBCytdjR2 4rCw== X-Gm-Message-State: AKS2vOwae/KkJPb7CNjwoo0+I+wCTYDgaPGt4Mr9Dw8JuhJYYU+V3IoU seRwfOgRcaDP62gc X-Received: by 10.223.139.87 with SMTP id v23mr40286321wra.145.1499337199972; Thu, 06 Jul 2017 03:33:19 -0700 (PDT) Received: from localhost.localdomain ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id s65sm17968668wmb.7.2017.07.06.03.33.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 06 Jul 2017 03:33:19 -0700 (PDT) From: Neil Armstrong To: architt@codeaurora.org, a.hajda@samsung.com Subject: [PATCH] drm/bridge: dw_hdmi: add cec notifier support Date: Thu, 6 Jul 2017 12:33:06 +0200 Message-Id: <1499337186-24429-1-git-send-email-narmstrong@baylibre.com> X-Mailer: git-send-email 1.9.1 Cc: linux-amlogic@lists.infradead.org, Russell King , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Neil Armstrong X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Russell King Add CEC notifier support to the HDMI bridge driver, so that the CEC part of the IP can receive its physical address. Tested-by: Neil Armstrong Acked-by: Neil Armstrong Acked-by: Hans Verkuil Signed-off-by: Russell King Signed-off-by: Neil Armstrong --- drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) Hi Archit, Hans, This is repost of Russell's patch from his dw-hdmi CEC patchset. Since his CEC implementation will be integrated in the bridge driver, this notifier patch won't be re-posted. But the Amlogic Platform needs a notifier since it uses a standalone CEC controller. Thanks, Neil diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c index ead1124..9c03846 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c @@ -33,6 +33,8 @@ #include #include +#include + #include "dw-hdmi.h" #include "dw-hdmi-audio.h" @@ -175,6 +177,8 @@ struct dw_hdmi { struct regmap *regm; void (*enable_audio)(struct dw_hdmi *hdmi); void (*disable_audio)(struct dw_hdmi *hdmi); + + struct cec_notifier *cec_notifier; }; #define HDMI_IH_PHY_STAT0_RX_SENSE \ @@ -1896,6 +1900,7 @@ 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); + cec_notifier_set_phys_addr_from_edid(hdmi->cec_notifier, edid); ret = drm_add_edid_modes(connector, edid); /* Store the ELD */ drm_edid_to_eld(connector, edid); @@ -2077,6 +2082,10 @@ void __dw_hdmi_setup_rx_sense(struct dw_hdmi *hdmi, bool hpd, bool rx_sense) dw_hdmi_update_phy_mask(hdmi); } mutex_unlock(&hdmi->mutex); + + if (!rx_sense && !hpd) + cec_notifier_set_phys_addr(hdmi->cec_notifier, + CEC_PHYS_ADDR_INVALID); } void dw_hdmi_setup_rx_sense(struct device *dev, bool hpd, bool rx_sense) @@ -2376,6 +2385,12 @@ static int dw_hdmi_detect_phy(struct dw_hdmi *hdmi) if (ret) goto err_iahb; + hdmi->cec_notifier = cec_notifier_get(dev); + if (!hdmi->cec_notifier) { + ret = -ENOMEM; + goto err_iahb; + } + /* * To prevent overflows in HDMI_IH_FC_STAT2, set the clk regenerator * N and cts values before enabling phy @@ -2452,6 +2467,9 @@ static int dw_hdmi_detect_phy(struct dw_hdmi *hdmi) hdmi->ddc = NULL; } + if (hdmi->cec_notifier) + cec_notifier_put(hdmi->cec_notifier); + clk_disable_unprepare(hdmi->iahb_clk); err_isfr: clk_disable_unprepare(hdmi->isfr_clk);