Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932808AbdCGSBF (ORCPT ); Tue, 7 Mar 2017 13:01:05 -0500 Received: from smtprelay.synopsys.com ([198.182.47.9]:48430 "EHLO smtprelay.synopsys.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752207AbdCGSA4 (ORCPT ); Tue, 7 Mar 2017 13:00:56 -0500 Subject: Re: [PATCH v3 6/6] drm: bridge: dw-hdmi: Move HPD handling to PHY operations To: Neil Armstrong , , , References: <1488904944-14285-1-git-send-email-narmstrong@baylibre.com> <1488904944-14285-7-git-send-email-narmstrong@baylibre.com> CC: , , , , , From: Jose Abreu Message-ID: Date: Tue, 7 Mar 2017 17:19:23 +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: <1488904944-14285-7-git-send-email-narmstrong@baylibre.com> Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.107.19.78] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 7859 Lines: 228 Hi Neil, On 07-03-2017 16:42, Neil Armstrong wrote: > The HDMI TX controller support HPD and RXSENSE signaling from the PHY > via it's STAT0 PHY interface, but some vendor PHYs can manage these > signals independently from the controller, thus these STAT0 handling > should be moved to PHY specific operations and become optional. > > The existing STAT0 HPD and RXSENSE handling code is refactored into > a supplementaty set of default PHY operations that are used automatically > when the platform glue doesn't provide its own operations. > > Signed-off-by: Neil Armstrong Looks nice! Reviewed-by: Jose Abreu Best regards, Jose Miguel Abreu > --- > drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 135 ++++++++++++++++++------------ > include/drm/bridge/dw_hdmi.h | 5 ++ > 2 files changed, 86 insertions(+), 54 deletions(-) > > diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c > index 348311c..1c6cb46 100644 > --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c > +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c > @@ -1215,10 +1215,46 @@ static enum drm_connector_status dw_hdmi_phy_read_hpd(struct dw_hdmi *hdmi, > connector_status_connected : connector_status_disconnected; > } > > +static void dw_hdmi_phy_update_hpd(struct dw_hdmi *hdmi, void *data, > + bool force, bool disabled, bool rxsense) > +{ > + u8 old_mask = hdmi->phy_mask; > + > + if (force || disabled || !rxsense) > + hdmi->phy_mask |= HDMI_PHY_RX_SENSE; > + else > + hdmi->phy_mask &= ~HDMI_PHY_RX_SENSE; > + > + if (old_mask != hdmi->phy_mask) > + hdmi_writeb(hdmi, hdmi->phy_mask, HDMI_PHY_MASK0); > +} > + > +static void dw_hdmi_phy_setup_hpd(struct dw_hdmi *hdmi, void *data) > +{ > + /* > + * 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 const struct dw_hdmi_phy_ops dw_hdmi_synopsys_phy_ops = { > .init = dw_hdmi_phy_init, > .disable = dw_hdmi_phy_disable, > .read_hpd = dw_hdmi_phy_read_hpd, > + .update_hpd = dw_hdmi_phy_update_hpd, > + .setup_hpd = dw_hdmi_phy_setup_hpd, > }; > > /* ----------------------------------------------------------------------------- > @@ -1742,35 +1778,10 @@ static void dw_hdmi_update_power(struct dw_hdmi *hdmi) > */ > static void dw_hdmi_update_phy_mask(struct dw_hdmi *hdmi) > { > - u8 old_mask = hdmi->phy_mask; > - > - if (hdmi->force || hdmi->disabled || !hdmi->rxsense) > - hdmi->phy_mask |= HDMI_PHY_RX_SENSE; > - else > - hdmi->phy_mask &= ~HDMI_PHY_RX_SENSE; > - > - if (old_mask != hdmi->phy_mask) > - 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); > + if (hdmi->phy.ops->update_hpd) > + hdmi->phy.ops->update_hpd(hdmi, hdmi->phy.data, > + hdmi->force, hdmi->disabled, > + hdmi->rxsense); > } > > static enum drm_connector_status > @@ -1962,6 +1973,41 @@ static irqreturn_t dw_hdmi_hardirq(int irq, void *dev_id) > return ret; > } > > +void __dw_hdmi_setup_rx_sense(struct dw_hdmi *hdmi, bool hpd, bool rx_sense) > +{ > + mutex_lock(&hdmi->mutex); > + > + if (!hdmi->disabled && !hdmi->force) { > + /* > + * If the RX sense status indicates we're disconnected, > + * clear the software rxsense status. > + */ > + if (!rx_sense) > + hdmi->rxsense = false; > + > + /* > + * Only set the software rxsense status when both > + * rxsense and hpd indicates we're connected. > + * This avoids what seems to be bad behaviour in > + * at least iMX6S versions of the phy. > + */ > + if (hpd) > + hdmi->rxsense = true; > + > + dw_hdmi_update_power(hdmi); > + dw_hdmi_update_phy_mask(hdmi); > + } > + mutex_unlock(&hdmi->mutex); > +} > + > +void dw_hdmi_setup_rx_sense(struct device *dev, bool hpd, bool rx_sense) > +{ > + struct dw_hdmi *hdmi = dev_get_drvdata(dev); > + > + __dw_hdmi_setup_rx_sense(hdmi, hpd, rx_sense); > +} > +EXPORT_SYMBOL_GPL(dw_hdmi_setup_rx_sense); > + > static irqreturn_t dw_hdmi_irq(int irq, void *dev_id) > { > struct dw_hdmi *hdmi = dev_id; > @@ -1994,30 +2040,10 @@ static irqreturn_t dw_hdmi_irq(int irq, void *dev_id) > * ask the source to re-read the EDID. > */ > if (intr_stat & > - (HDMI_IH_PHY_STAT0_RX_SENSE | HDMI_IH_PHY_STAT0_HPD)) { > - mutex_lock(&hdmi->mutex); > - if (!hdmi->disabled && !hdmi->force) { > - /* > - * If the RX sense status indicates we're disconnected, > - * clear the software rxsense status. > - */ > - if (!(phy_stat & HDMI_PHY_RX_SENSE)) > - hdmi->rxsense = false; > - > - /* > - * Only set the software rxsense status when both > - * rxsense and hpd indicates we're connected. > - * This avoids what seems to be bad behaviour in > - * at least iMX6S versions of the phy. > - */ > - if (phy_stat & HDMI_PHY_HPD) > - hdmi->rxsense = true; > - > - dw_hdmi_update_power(hdmi); > - dw_hdmi_update_phy_mask(hdmi); > - } > - mutex_unlock(&hdmi->mutex); > - } > + (HDMI_IH_PHY_STAT0_RX_SENSE | HDMI_IH_PHY_STAT0_HPD)) > + __dw_hdmi_setup_rx_sense(hdmi, > + phy_stat & HDMI_PHY_HPD, > + phy_stat & HDMI_PHY_RX_SENSE); > > if (intr_stat & HDMI_IH_PHY_STAT0_HPD) { > dev_dbg(hdmi->dev, "EVENT=%s\n", > @@ -2291,7 +2317,8 @@ static int dw_hdmi_detect_phy(struct dw_hdmi *hdmi) > #endif > > dw_hdmi_fb_registered(hdmi); > - dw_hdmi_phy_setup_hpd(hdmi); > + if (hdmi->phy.ops->setup_hpd) > + hdmi->phy.ops->setup_hpd(hdmi, hdmi->phy.data); > > memset(&pdevinfo, 0, sizeof(pdevinfo)); > pdevinfo.parent = dev; > diff --git a/include/drm/bridge/dw_hdmi.h b/include/drm/bridge/dw_hdmi.h > index c3b8da9..e332b8e 100644 > --- a/include/drm/bridge/dw_hdmi.h > +++ b/include/drm/bridge/dw_hdmi.h > @@ -117,6 +117,9 @@ struct dw_hdmi_phy_ops { > struct drm_display_mode *mode); > void (*disable)(struct dw_hdmi *hdmi, void *data); > enum drm_connector_status (*read_hpd)(struct dw_hdmi *hdmi, void *data); > + void (*update_hpd)(struct dw_hdmi *hdmi, void *data, > + bool force, bool disabled, bool rxsense); > + void (*setup_hpd)(struct dw_hdmi *hdmi, void *data); > }; > > struct dw_hdmi_plat_data { > @@ -147,6 +150,8 @@ int dw_hdmi_probe(struct platform_device *pdev, > int dw_hdmi_bind(struct platform_device *pdev, struct drm_encoder *encoder, > const struct dw_hdmi_plat_data *plat_data); > > +void dw_hdmi_setup_rx_sense(struct device *dev, bool hpd, bool rx_sense); > + > void dw_hdmi_set_sample_rate(struct dw_hdmi *hdmi, unsigned int rate); > void dw_hdmi_audio_enable(struct dw_hdmi *hdmi); > void dw_hdmi_audio_disable(struct dw_hdmi *hdmi);