diff mbox series

adv7604: fix HPD support for adv7611/12

Message ID c7093e76-ffb4-b19c-f576-b264f935a3ce@xs4all.nl (mailing list archive)
State New, archived
Headers show
Series adv7604: fix HPD support for adv7611/12 | expand

Commit Message

Hans Verkuil March 24, 2021, 7:56 a.m. UTC 
For the adv7604 the hotplug detect pin is controlled through gpio pins from
the SoC, but the adv7611 and adv7612 control the hotplug detect pin themselves.

But the driver had no support for this, so the HPD was always high, even when
changing the EDID. Add proper support for this to the driver.

Tested with an adv7612.

Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
---

Comments

Niklas Söderlund March 26, 2021, 12:38 a.m. UTC | #1 
Hi Hans,

Thanks for your patch.

On 2021-03-24 08:56:42 +0100, Hans Verkuil wrote:
> For the adv7604 the hotplug detect pin is controlled through gpio pins from
> the SoC, but the adv7611 and adv7612 control the hotplug detect pin themselves.
> 
> But the driver had no support for this, so the HPD was always high, even when
> changing the EDID. Add proper support for this to the driver.
> 
> Tested with an adv7612.
> 
> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>

Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>

> ---
> diff --git a/drivers/media/i2c/adv7604.c b/drivers/media/i2c/adv7604.c
> index 7547afc85eb1..15bcb88ca2e3 100644
> --- a/drivers/media/i2c/adv7604.c
> +++ b/drivers/media/i2c/adv7604.c
> @@ -519,10 +519,17 @@ static inline int edid_write_block(struct v4l2_subdev *sd,
> 
>  static void adv76xx_set_hpd(struct adv76xx_state *state, unsigned int hpd)
>  {
> +	const struct adv76xx_chip_info *info = state->info;
>  	unsigned int i;
> 
> -	for (i = 0; i < state->info->num_dv_ports; ++i)
> -		gpiod_set_value_cansleep(state->hpd_gpio[i], hpd & BIT(i));
> +	if (info->type == ADV7604) {
> +		for (i = 0; i < state->info->num_dv_ports; ++i)
> +			gpiod_set_value_cansleep(state->hpd_gpio[i], hpd & BIT(i));
> +	} else {
> +		for (i = 0; i < state->info->num_dv_ports; ++i)
> +			io_write_clr_set(&state->sd, 0x20, 0x80 >> i,
> +					 (!!(hpd & BIT(i))) << (7 - i));
> +	}
> 
>  	v4l2_subdev_notify(&state->sd, ADV76XX_HOTPLUG, &hpd);
>  }
> @@ -2826,6 +2833,18 @@ static int adv76xx_core_init(struct v4l2_subdev *sd)
>  	io_write(sd, 0x0b, 0x44);   /* Power down ESDP block */
>  	cp_write(sd, 0xcf, 0x01);   /* Power down macrovision */
> 
> +	/* HPD */
> +	if (info->type != ADV7604) {
> +		/* Set manual HPD values to 0 */
> +		io_write_clr_set(sd, 0x20, 0xc0, 0);
> +		/*
> +		 * Set HPA_DELAY to 200 ms and set automatic HPD control
> +		 * to: internal EDID is active AND a cable is detected
> +		 * AND the manual HPD control is set to 1.
> +		 */
> +		hdmi_write_clr_set(sd, 0x6c, 0xf6, 0x26);
> +	}
> +
>  	/* video format */
>  	io_write_clr_set(sd, 0x02, 0x0f, pdata->alt_gamma << 3);
>  	io_write_clr_set(sd, 0x05, 0x0e, pdata->blank_data << 3 |
diff mbox series

Patch

diff --git a/drivers/media/i2c/adv7604.c b/drivers/media/i2c/adv7604.c
index 7547afc85eb1..15bcb88ca2e3 100644
--- a/drivers/media/i2c/adv7604.c
+++ b/drivers/media/i2c/adv7604.c
@@ -519,10 +519,17 @@  static inline int edid_write_block(struct v4l2_subdev *sd,

 static void adv76xx_set_hpd(struct adv76xx_state *state, unsigned int hpd)
 {
+	const struct adv76xx_chip_info *info = state->info;
 	unsigned int i;

-	for (i = 0; i < state->info->num_dv_ports; ++i)
-		gpiod_set_value_cansleep(state->hpd_gpio[i], hpd & BIT(i));
+	if (info->type == ADV7604) {
+		for (i = 0; i < state->info->num_dv_ports; ++i)
+			gpiod_set_value_cansleep(state->hpd_gpio[i], hpd & BIT(i));
+	} else {
+		for (i = 0; i < state->info->num_dv_ports; ++i)
+			io_write_clr_set(&state->sd, 0x20, 0x80 >> i,
+					 (!!(hpd & BIT(i))) << (7 - i));
+	}

 	v4l2_subdev_notify(&state->sd, ADV76XX_HOTPLUG, &hpd);
 }
@@ -2826,6 +2833,18 @@  static int adv76xx_core_init(struct v4l2_subdev *sd)
 	io_write(sd, 0x0b, 0x44);   /* Power down ESDP block */
 	cp_write(sd, 0xcf, 0x01);   /* Power down macrovision */

+	/* HPD */
+	if (info->type != ADV7604) {
+		/* Set manual HPD values to 0 */
+		io_write_clr_set(sd, 0x20, 0xc0, 0);
+		/*
+		 * Set HPA_DELAY to 200 ms and set automatic HPD control
+		 * to: internal EDID is active AND a cable is detected
+		 * AND the manual HPD control is set to 1.
+		 */
+		hdmi_write_clr_set(sd, 0x6c, 0xf6, 0x26);
+	}
+
 	/* video format */
 	io_write_clr_set(sd, 0x02, 0x0f, pdata->alt_gamma << 3);
 	io_write_clr_set(sd, 0x05, 0x0e, pdata->blank_data << 3 |