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

Commit 6af8cc0b authored by Devin Heitmueller's avatar Devin Heitmueller Committed by Mauro Carvalho Chehab
Browse files

[media] cx231xx: Fix vblank/vactive line counts for PAL/SECAM 



Adjust the vblank and vactive counts so that they don't throw an error in
cx25840's set_std call (we did an equivalent change for NTSC when we got the
scaler working).

Signed-off-by: default avatarDevin Heitmueller <dheitmueller@hauppauge.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 222c4352

drivers/media/video/cx231xx/cx231xx-avcore.c

+6 −6
Original line number Diff line number Diff line
@@ -1012,21 +1012,21 @@ int cx231xx_do_mode_ctrl_overrides(struct cx231xx *dev) 
		status =  cx231xx_read_modify_write_i2c_dword(dev,

							VID_BLK_I2C_ADDRESS,

							VERT_TIM_CTRL,

							FLD_VBLANK_CNT, 0x24);

							FLD_VBLANK_CNT, 0x20);

		status = cx231xx_read_modify_write_i2c_dword(dev,

							VID_BLK_I2C_ADDRESS,

							VERT_TIM_CTRL,

							FLD_VACTIVE_CNT,

							cx231xx_set_field

							(FLD_VACTIVE_CNT,

							 0x240));

							 0x244));

		status = cx231xx_read_modify_write_i2c_dword(dev,

							VID_BLK_I2C_ADDRESS,

							VERT_TIM_CTRL,

							FLD_V656BLANK_CNT,

							cx231xx_set_field

							(FLD_V656BLANK_CNT,

							0x28));

							0x24));

		/* Adjust the active video horizontal start point */

		status = cx231xx_read_modify_write_i2c_dword(dev,

							VID_BLK_I2C_ADDRESS,
@@ -1039,21 +1039,21 @@ int cx231xx_do_mode_ctrl_overrides(struct cx231xx *dev) 
		status = cx231xx_read_modify_write_i2c_dword(dev,

							VID_BLK_I2C_ADDRESS,

							VERT_TIM_CTRL,

							FLD_VBLANK_CNT, 0x24);

							FLD_VBLANK_CNT, 0x20);

		status = cx231xx_read_modify_write_i2c_dword(dev,

							VID_BLK_I2C_ADDRESS,

							VERT_TIM_CTRL,

							FLD_VACTIVE_CNT,

							cx231xx_set_field

							(FLD_VACTIVE_CNT,

							 0x240));

							 0x244));

		status = cx231xx_read_modify_write_i2c_dword(dev,

							VID_BLK_I2C_ADDRESS,

							VERT_TIM_CTRL,

							FLD_V656BLANK_CNT,

							cx231xx_set_field

							(FLD_V656BLANK_CNT,

							0x28));

							0x24));

		/* Adjust the active video horizontal start point */

		status = cx231xx_read_modify_write_i2c_dword(dev,

							VID_BLK_I2C_ADDRESS,