Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5380baaf authored by jean-michel.hautbois@vodalys.com's avatar jean-michel.hautbois@vodalys.com Committed by Mauro Carvalho Chehab
Browse files

[media] media: adv7604: Fix masks used for querying timings in ADV7611 



All masks for timings are different between ADV7604 and ADV7611.
Most of the values have 1 precision bit more in the latter.
Fix this by adding new fields to the chip_info structure.

Signed-off-by: default avatarJean-Michel Hautbois <jean-michel.hautbois@vodalys.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 44b0c738

drivers/media/i2c/adv7604.c

+56 −13
Original line number Diff line number Diff line
@@ -124,6 +124,20 @@ struct adv76xx_chip_info { 
	unsigned int num_recommended_settings[2];



	unsigned long page_mask;



	/* Masks for timings */

	unsigned int linewidth_mask;

	unsigned int field0_height_mask;

	unsigned int field1_height_mask;

	unsigned int hfrontporch_mask;

	unsigned int hsync_mask;

	unsigned int hbackporch_mask;

	unsigned int field0_vfrontporch_mask;

	unsigned int field1_vfrontporch_mask;

	unsigned int field0_vsync_mask;

	unsigned int field1_vsync_mask;

	unsigned int field0_vbackporch_mask;

	unsigned int field1_vbackporch_mask;

};



/*
@@ -1504,23 +1518,28 @@ static int adv76xx_query_dv_timings(struct v4l2_subdev *sd, 
	if (is_digital_input(sd)) {

		timings->type = V4L2_DV_BT_656_1120;



		/* FIXME: All masks are incorrect for ADV7611 */

		bt->width = hdmi_read16(sd, 0x07, 0xfff);

		bt->height = hdmi_read16(sd, 0x09, 0xfff);

		bt->width = hdmi_read16(sd, 0x07, info->linewidth_mask);

		bt->height = hdmi_read16(sd, 0x09, info->field0_height_mask);

		bt->pixelclock = info->read_hdmi_pixelclock(sd);

		bt->hfrontporch = hdmi_read16(sd, 0x20, 0x3ff);

		bt->hsync = hdmi_read16(sd, 0x22, 0x3ff);

		bt->hbackporch = hdmi_read16(sd, 0x24, 0x3ff);

		bt->vfrontporch = hdmi_read16(sd, 0x2a, 0x1fff) / 2;

		bt->vsync = hdmi_read16(sd, 0x2e, 0x1fff) / 2;

		bt->vbackporch = hdmi_read16(sd, 0x32, 0x1fff) / 2;

		bt->hfrontporch = hdmi_read16(sd, 0x20, info->hfrontporch_mask);

		bt->hsync = hdmi_read16(sd, 0x22, info->hsync_mask);

		bt->hbackporch = hdmi_read16(sd, 0x24, info->hbackporch_mask);

		bt->vfrontporch = hdmi_read16(sd, 0x2a,

			info->field0_vfrontporch_mask) / 2;

		bt->vsync = hdmi_read16(sd, 0x2e, info->field0_vsync_mask) / 2;

		bt->vbackporch = hdmi_read16(sd, 0x32,

			info->field0_vbackporch_mask) / 2;

		bt->polarities = ((hdmi_read(sd, 0x05) & 0x10) ? V4L2_DV_VSYNC_POS_POL : 0) |

			((hdmi_read(sd, 0x05) & 0x20) ? V4L2_DV_HSYNC_POS_POL : 0);

		if (bt->interlaced == V4L2_DV_INTERLACED) {

			bt->height += hdmi_read16(sd, 0x0b, 0xfff);

			bt->il_vfrontporch = hdmi_read16(sd, 0x2c, 0x1fff) / 2;

			bt->il_vsync = hdmi_read16(sd, 0x30, 0x1fff) / 2;

			bt->il_vbackporch = hdmi_read16(sd, 0x34, 0x1fff) / 2;

			bt->height += hdmi_read16(sd, 0x0b,

				info->field1_height_mask);

			bt->il_vfrontporch = hdmi_read16(sd, 0x2c,

				info->field1_vfrontporch_mask) / 2;

			bt->il_vsync = hdmi_read16(sd, 0x30,

				info->field1_vsync_mask) / 2;

			bt->il_vbackporch = hdmi_read16(sd, 0x34,

				info->field1_vbackporch_mask) / 2;

		}

		adv76xx_fill_optional_dv_timings_fields(sd, timings);

	} else {
@@ -2567,6 +2586,18 @@ static const struct adv76xx_chip_info adv76xx_chip_info[] = { 
			BIT(ADV76XX_PAGE_EDID) | BIT(ADV76XX_PAGE_HDMI) |

			BIT(ADV76XX_PAGE_TEST) | BIT(ADV76XX_PAGE_CP) |

			BIT(ADV7604_PAGE_VDP),

		.linewidth_mask = 0xfff,

		.field0_height_mask = 0xfff,

		.field1_height_mask = 0xfff,

		.hfrontporch_mask = 0x3ff,

		.hsync_mask = 0x3ff,

		.hbackporch_mask = 0x3ff,

		.field0_vfrontporch_mask = 0x1fff,

		.field0_vsync_mask = 0x1fff,

		.field0_vbackporch_mask = 0x1fff,

		.field1_vfrontporch_mask = 0x1fff,

		.field1_vsync_mask = 0x1fff,

		.field1_vbackporch_mask = 0x1fff,

	},

	[ADV7611] = {

		.type = ADV7611,
@@ -2596,6 +2627,18 @@ static const struct adv76xx_chip_info adv76xx_chip_info[] = { 
			BIT(ADV76XX_PAGE_INFOFRAME) | BIT(ADV76XX_PAGE_AFE) |

			BIT(ADV76XX_PAGE_REP) |  BIT(ADV76XX_PAGE_EDID) |

			BIT(ADV76XX_PAGE_HDMI) | BIT(ADV76XX_PAGE_CP),

		.linewidth_mask = 0x1fff,

		.field0_height_mask = 0x1fff,

		.field1_height_mask = 0x1fff,

		.hfrontporch_mask = 0x1fff,

		.hsync_mask = 0x1fff,

		.hbackporch_mask = 0x1fff,

		.field0_vfrontporch_mask = 0x3fff,

		.field0_vsync_mask = 0x3fff,

		.field0_vbackporch_mask = 0x3fff,

		.field1_vfrontporch_mask = 0x3fff,

		.field1_vsync_mask = 0x3fff,

		.field1_vbackporch_mask = 0x3fff,

	},

};