Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752536AbdGFKnJ (ORCPT ); Thu, 6 Jul 2017 06:43:09 -0400 Received: from us01smtprelay-2.synopsys.com ([198.182.60.111]:38994 "EHLO smtprelay.synopsys.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752410AbdGFKnH (ORCPT ); Thu, 6 Jul 2017 06:43:07 -0400 Subject: Re: [PATCH] drm/bridge: dw_hdmi: add cec notifier support To: Neil Armstrong References: <1499337186-24429-1-git-send-email-narmstrong@baylibre.com> CC: , , , Russell King , , From: Jose Abreu Message-ID: Date: Thu, 6 Jul 2017 11:43:00 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.4.0 MIME-Version: 1.0 In-Reply-To: <1499337186-24429-1-git-send-email-narmstrong@baylibre.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.107.19.108] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3267 Lines: 102 Hi Neil, On 06-07-2017 11:33, Neil Armstrong wrote: > 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 Don't you also have to "select CEC_NOTIFIER" in Kconfig? Or is it not needed anymore with the recent Kconfig changes of CEC? Best regards, Jose Miguel Abreu > + > #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);