Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1286579

Re: [PATCH v10 14/17] drm: bridge: analogix/dp: try force hpd after plug in lookup failed

From Rob Herring <robh@kernel.org>
Newsgroups linux.kernel
Subject Re: [PATCH v10 14/17] drm: bridge: analogix/dp: try force hpd after plug in lookup failed
Date 2015-12-08 16:20 +0100
Message-ID <qDsdA-41I-23@gated-at.bofh.it> (permalink)
References <qCXCN-T6-5@gated-at.bofh.it> <qCXMu-Wu-33@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw

On Mon, Dec 07, 2015 at 02:40:42PM +0800, Yakir Yang wrote:
> Some edp screen do not have hpd signal, so we can't just return
> failed when hpd plug in detect failed.
> 
> This is an hardware property, so we need add a devicetree property
> "analogix,need-force-hpd" to indicate this sutiation.

I can see this being common. Just make it "force-hpd".

Rob

> 
> Signed-off-by: Yakir Yang <ykk@rock-chips.com>
> Tested-by: Javier Martinez Canillas <javier@osg.samsung.com>
> ---
> Changes in v10: None
> Changes in v9: None
> Changes in v8: None
> Changes in v7: None
> Changes in v6: None
> Changes in v5: None
> Changes in v4: None
> Changes in v3:
> - Add "analogix,need-force-hpd" to indicate whether driver need foce
>   hpd when hpd detect failed.
> 
> Changes in v2: None
> 
>  .../bindings/display/bridge/analogix_dp.txt        |  4 ++-
>  .../bindings/display/exynos/exynos_dp.txt          |  1 +
>  .../display/rockchip/analogix_dp-rockchip.txt      |  1 +
>  drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 36 +++++++++++++++++++---
>  drivers/gpu/drm/bridge/analogix/analogix_dp_core.h |  2 ++
>  drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c  |  9 ++++++
>  6 files changed, 47 insertions(+), 6 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/display/bridge/analogix_dp.txt b/Documentation/devicetree/bindings/display/bridge/analogix_dp.txt
> index 7659a7a..74f0e80 100644
> --- a/Documentation/devicetree/bindings/display/bridge/analogix_dp.txt
> +++ b/Documentation/devicetree/bindings/display/bridge/analogix_dp.txt
> @@ -22,6 +22,9 @@ Required properties for dp-controller:
>  		from general PHY binding: Should be "dp".
>  
>  Optional properties for dp-controller:
> +	-analogix,need-force-hpd:
> +		Indicate driver need force hpd when hpd detect failed, this
> +		is used for some eDP screen which don't have hpd signal.
>  	-hpd-gpios:
>  		Hotplug detect GPIO.
>  		Indicates which GPIO should be used for hotplug detection
> @@ -31,7 +34,6 @@ Optional properties for dp-controller:
>  		* Documentation/devicetree/bindings/display/exynos/exynos_dp.txt
>  		* Documentation/devicetree/bindings/video/analogix_dp-rockchip.txt
>  
> -
>  [1]: Documentation/devicetree/bindings/media/video-interfaces.txt
>  -------------------------------------------------------------------------------
>  
> diff --git a/Documentation/devicetree/bindings/display/exynos/exynos_dp.txt b/Documentation/devicetree/bindings/display/exynos/exynos_dp.txt
> index 9905081..8800164 100644
> --- a/Documentation/devicetree/bindings/display/exynos/exynos_dp.txt
> +++ b/Documentation/devicetree/bindings/display/exynos/exynos_dp.txt
> @@ -41,6 +41,7 @@ For the below properties, please refer to Analogix DP binding document:
>  	-phys (required)
>  	-phy-names (required)
>  	-hpd-gpios (optional)
> +	-analogix,need-force-hpd (optional)
>  	-video interfaces (optional)
>  
>  Deprecated properties for DisplayPort:
> diff --git a/Documentation/devicetree/bindings/display/rockchip/analogix_dp-rockchip.txt b/Documentation/devicetree/bindings/display/rockchip/analogix_dp-rockchip.txt
> index dae86c4..1f1e594 100644
> --- a/Documentation/devicetree/bindings/display/rockchip/analogix_dp-rockchip.txt
> +++ b/Documentation/devicetree/bindings/display/rockchip/analogix_dp-rockchip.txt
> @@ -32,6 +32,7 @@ For the below properties, please refer to Analogix DP binding document:
>  - phys (required)
>  - phy-names (required)
>  - hpd-gpios (optional)
> +- analogix,need-force-hpd (optional)
>  -------------------------------------------------------------------------------
>  
>  Example:
> diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
> index a11504b..94968e4 100644
> --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
> +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
> @@ -59,15 +59,38 @@ static int analogix_dp_detect_hpd(struct analogix_dp_device *dp)
>  {
>  	int timeout_loop = 0;
>  
> -	while (analogix_dp_get_plug_in_status(dp) != 0) {
> +	while (timeout_loop < DP_TIMEOUT_LOOP_COUNT) {
> +		if (analogix_dp_get_plug_in_status(dp) == 0)
> +			return 0;
> +
>  		timeout_loop++;
> -		if (timeout_loop > DP_TIMEOUT_LOOP_COUNT) {
> -			dev_err(dp->dev, "failed to get hpd plug status\n");
> -			return -ETIMEDOUT;
> -		}
>  		usleep_range(10, 11);
>  	}
>  
> +	/*
> +	 * Some edp screen do not have hpd signal, so we can't just
> +	 * return failed when hpd plug in detect failed, DT property
> +	 * "need-force-hpd" would indicate whether driver need this.
> +	 */
> +	if (!dp->need_force_hpd)
> +		return -ETIMEDOUT;
> +
> +	/*
> +	 * The eDP TRM indicate that if HPD_STATUS(RO) is 0, AUX CH
> +	 * will not work, so we need to give a force hpd action to
> +	 * set HPD_STATUS manually.
> +	 */
> +	dev_dbg(dp->dev, "failed to get hpd plug status, try to force hpd\n");
> +
> +	analogix_dp_force_hpd(dp);
> +
> +	if (analogix_dp_get_plug_in_status(dp) != 0) {
> +		dev_err(dp->dev, "failed to get hpd plug in status\n");
> +		return -EINVAL;
> +	}
> +
> +	dev_dbg(dp->dev, "success to get plug in status after force hpd\n");
> +
>  	return 0;
>  }
>  
> @@ -1246,6 +1269,9 @@ int analogix_dp_bind(struct device *dev, struct drm_device *drm_dev,
>  	if (IS_ERR(dp->reg_base))
>  		return PTR_ERR(dp->reg_base);
>  
> +	dp->need_force_hpd =
> +		of_property_read_bool(dev->of_node, "analogix,need-force-hpd");
> +
>  	dp->hpd_gpio = of_get_named_gpio(dev->of_node, "hpd-gpios", 0);
>  	if (!gpio_is_valid(dp->hpd_gpio))
>  		dp->hpd_gpio = of_get_named_gpio(dev->of_node,
> diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h
> index e6f8243..d3c7e0a 100644
> --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h
> +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h
> @@ -160,6 +160,7 @@ struct analogix_dp_device {
>  	struct phy		*phy;
>  	int			dpms_mode;
>  	int			hpd_gpio;
> +	bool                    need_force_hpd;
>  
>  	struct analogix_dp_plat_data *plat_data;
>  };
> @@ -180,6 +181,7 @@ void analogix_dp_set_analog_power_down(struct analogix_dp_device *dp,
>  				       bool enable);
>  void analogix_dp_init_analog_func(struct analogix_dp_device *dp);
>  void analogix_dp_init_hpd(struct analogix_dp_device *dp);
> +void analogix_dp_force_hpd(struct analogix_dp_device *dp);
>  enum dp_irq_type analogix_dp_get_irq_type(struct analogix_dp_device *dp);
>  void analogix_dp_clear_hotplug_interrupts(struct analogix_dp_device *dp);
>  void analogix_dp_reset_aux(struct analogix_dp_device *dp);
> diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c
> index 21a3287..c7e2959 100644
> --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c
> +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c
> @@ -365,6 +365,15 @@ void analogix_dp_init_hpd(struct analogix_dp_device *dp)
>  	writel(reg, dp->reg_base + ANALOGIX_DP_SYS_CTL_3);
>  }
>  
> +void analogix_dp_force_hpd(struct analogix_dp_device *dp)
> +{
> +	u32 reg;
> +
> +	reg = readl(dp->reg_base + ANALOGIX_DP_SYS_CTL_3);
> +	reg = (F_HPD | HPD_CTRL);
> +	writel(reg, dp->reg_base + ANALOGIX_DP_SYS_CTL_3);
> +}
> +
>  enum dp_irq_type analogix_dp_get_irq_type(struct analogix_dp_device *dp)
>  {
>  	u32 reg;
> -- 
> 1.9.1
> 
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v10 0/17] Add Analogix Core Display Port Driver Yakir Yang <ykk@rock-chips.com> - 2015-12-07 07:40 +0100
  [PATCH v10 06/17] ARM: dts: exynos/dp: remove some properties that deprecated by analogix_dp driver Yakir Yang <ykk@rock-chips.com> - 2015-12-07 07:40 +0100
  [PATCH v10 10/17] dt-bindings: add document for rockchip dp phy Yakir Yang <ykk@rock-chips.com> - 2015-12-07 07:50 +0100
    Re: [PATCH v10 10/17] dt-bindings: add document for rockchip dp phy Rob Herring <robh@kernel.org> - 2015-12-08 16:10 +0100
      Re: [PATCH v10 10/17] dt-bindings: add document for rockchip dp phy Yakir Yang <ykk@rock-chips.com> - 2015-12-09 02:20 +0100
  [PATCH v10 09/17] phy: Add driver for rockchip Display Port PHY Yakir Yang <ykk@rock-chips.com> - 2015-12-07 07:50 +0100
  [PATCH v10 11/17] drm: rockchip: vop: add bpc and color mode setting Yakir Yang <ykk@rock-chips.com> - 2015-12-07 07:50 +0100
  [PATCH v10 05/17] dt-bindings: add document for analogix display port driver Yakir Yang <ykk@rock-chips.com> - 2015-12-07 07:50 +0100
    Re: [PATCH v10 05/17] dt-bindings: add document for analogix display  port driver Rob Herring <robh@kernel.org> - 2015-12-08 16:10 +0100
      Re: [PATCH v10 05/17] dt-bindings: add document for analogix display  port driver Yakir Yang <ykk@rock-chips.com> - 2015-12-09 02:10 +0100
  [PATCH v10 13/17] drm: bridge: analogix/dp: add max link rate and lane count limit for RK3288 Yakir Yang <ykk@rock-chips.com> - 2015-12-07 07:50 +0100
  [PATCH v10 16/17] drm: bridge: analogix/dp: add edid modes parse in get_modes method Yakir Yang <ykk@rock-chips.com> - 2015-12-07 07:50 +0100
  [PATCH v10 17/17] drm: bridge: analogix/dp: expand the look time for waiting AUX CH reply Yakir Yang <ykk@rock-chips.com> - 2015-12-07 07:50 +0100
  [PATCH v10 08/17] dt-bindings: add document for rockchip variant of analogix_dp Yakir Yang <ykk@rock-chips.com> - 2015-12-07 07:50 +0100
    Re: [PATCH v10 08/17] dt-bindings: add document for rockchip variant  of analogix_dp Rob Herring <robh@kernel.org> - 2015-12-08 16:10 +0100
      Re: [PATCH v10 08/17] dt-bindings: add document for rockchip variant  of analogix_dp Yakir Yang <ykk@rock-chips.com> - 2015-12-09 02:10 +0100
  [PATCH v10 03/17] drm: bridge: analogix/dp: remove duplicate configuration of link rate and link count Yakir Yang <ykk@rock-chips.com> - 2015-12-07 07:50 +0100
  [PATCH v10 12/17] drm: bridge: analogix/dp: add some rk3288 special registers setting Yakir Yang <ykk@rock-chips.com> - 2015-12-07 07:50 +0100
  [PATCH v10 15/17] drm: bridge: analogix/dp: move hpd detect to connector detect function Yakir Yang <ykk@rock-chips.com> - 2015-12-07 07:50 +0100
  [PATCH v10 04/17] drm: bridge: analogix/dp: dynamic parse sync_pol & interlace & dynamic_range Yakir Yang <ykk@rock-chips.com> - 2015-12-07 07:50 +0100
  [PATCH v10 02/17] drm: bridge: analogix/dp: fix some obvious code style Yakir Yang <ykk@rock-chips.com> - 2015-12-07 07:50 +0100
  [PATCH v10 14/17] drm: bridge: analogix/dp: try force hpd after plug in lookup failed Yakir Yang <ykk@rock-chips.com> - 2015-12-07 07:50 +0100
    Re: [PATCH v10 14/17] drm: bridge: analogix/dp: try force hpd after  plug in lookup failed Rob Herring <robh@kernel.org> - 2015-12-08 16:20 +0100
      Re: [PATCH v10 14/17] drm: bridge: analogix/dp: try force hpd after  plug in lookup failed Yakir Yang <ykk@rock-chips.com> - 2015-12-09 02:30 +0100
  Re: [PATCH v10 01/17] drm: bridge: analogix/dp: split exynos dp  driver to bridge directory Yakir Yang <ykk@rock-chips.com> - 2015-12-07 08:40 +0100
  Re: [PATCH v10 0/17] Add Analogix Core Display Port Driver Heiko Stübner <heiko@sntech.de> - 2015-12-08 16:40 +0100
    Re: [PATCH v10 0/17] Add Analogix Core Display Port Driver Heiko Stübner <heiko@sntech.de> - 2015-12-09 16:00 +0100
  [PATCH v10.1 08/17] dt-bindings: add document for rockchip variant of analogix_dp Yakir Yang <ykk@rock-chips.com> - 2015-12-09 03:10 +0100
  [PATCH v10.1 05/17] dt-bindings: add document for analogix display port driver Yakir Yang <ykk@rock-chips.com> - 2015-12-09 03:10 +0100
  [PATCH v10.1 14/17] drm: bridge: analogix/dp: try force hpd after plug in lookup failed Yakir Yang <ykk@rock-chips.com> - 2015-12-09 03:20 +0100
    Re: [PATCH v10.1 14/17] drm: bridge: analogix/dp: try force hpd  after plug in lookup failed Rob Herring <robh@kernel.org> - 2015-12-09 05:30 +0100
      Re: [PATCH v10.1 14/17] drm: bridge: analogix/dp: try force hpd after  plug in lookup failed Yakir Yang <ykk@rock-chips.com> - 2015-12-09 07:00 +0100
  [PATCH v10.1 10/17] dt-bindings: add document for rockchip dp phy Yakir Yang <ykk@rock-chips.com> - 2015-12-09 03:20 +0100
  [PATCH v10.2 14/17] drm: bridge: analogix/dp: try force hpd after plug in lookup failed Yakir Yang <ykk@rock-chips.com> - 2015-12-09 07:30 +0100
  [PATCH v10 19/19] drm: bridge: analogix/dp: Fix the possible dead lock in bridge disable time Yakir Yang <ykk@rock-chips.com> - 2015-12-10 10:00 +0100
  [PATCH v10 18/19] drm: bridge: analogix/dp: add panel prepare/unprepare in suspend/resume time Yakir Yang <ykk@rock-chips.com> - 2015-12-10 10:00 +0100
  [PATCH v10.1 15/19] drm: bridge: analogix/dp: move hpd detect to connector detect function Yakir Yang <ykk@rock-chips.com> - 2015-12-10 10:00 +0100

csiph-web