Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934753AbdCVNyq (ORCPT ); Wed, 22 Mar 2017 09:54:46 -0400 Received: from smtprelay2.synopsys.com ([198.182.60.111]:43068 "EHLO smtprelay.synopsys.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759627AbdCVNyR (ORCPT ); Wed, 22 Mar 2017 09:54:17 -0400 Subject: Re: [PATCH v4 1/6] drm: bridge: dw-hdmi: Extract PHY interrupt setup to a function To: Neil Armstrong , , , References: <1490109161-20529-1-git-send-email-narmstrong@baylibre.com> <1490109161-20529-2-git-send-email-narmstrong@baylibre.com> CC: , , , , From: Jose Abreu Message-ID: Date: Wed, 22 Mar 2017 13:53:07 +0000 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: <1490109161-20529-2-git-send-email-narmstrong@baylibre.com> Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.107.19.97] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3936 Lines: 114 Hi Neil, On 21-03-2017 15:12, Neil Armstrong wrote: > From: Laurent Pinchart > > 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 > Signed-off-by: Neil Armstrong Reviewed-by: Jose Abreu Maybe if you submit a next version we could get rid of "dw_hdmi_fb_registered" totally and move the remaining setup code to a new "dw_hdmi_setup_i2c" function. Best regards, Jose Miguel Abreu > --- > drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 50 ++++++++++++++----------------- > 1 file changed, 23 insertions(+), 27 deletions(-) > > diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c > index af93f7a..f82750a 100644 > --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c > +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c > @@ -1559,7 +1559,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); > @@ -1567,15 +1567,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) > @@ -1693,6 +1684,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) > { > @@ -2204,29 +2215,14 @@ static int dw_hdmi_detect_phy(struct dw_hdmi *hdmi) > 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;