diff options
| author | Devin Heitmueller <dheitmueller@hauppauge.com> | 2010-08-19 14:18:32 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-10-20 23:17:36 -0400 |
| commit | 6af8cc0b2553b7bed060592c07244bd2d75737c9 (patch) | |
| tree | 4078bd20d050fae9c3935a1a344d00c6a41379ce /drivers/media/video/cx231xx | |
| parent | 222c43520513f308ad50308d134c8ea62d7d5cf1 (diff) | |
[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: Devin Heitmueller <dheitmueller@hauppauge.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx231xx')
| -rw-r--r-- | drivers/media/video/cx231xx/cx231xx-avcore.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/media/video/cx231xx/cx231xx-avcore.c b/drivers/media/video/cx231xx/cx231xx-avcore.c index ebbdd90cac06..b4eda903d27d 100644 --- a/drivers/media/video/cx231xx/cx231xx-avcore.c +++ b/drivers/media/video/cx231xx/cx231xx-avcore.c | |||
| @@ -1012,21 +1012,21 @@ int cx231xx_do_mode_ctrl_overrides(struct cx231xx *dev) | |||
| 1012 | status = cx231xx_read_modify_write_i2c_dword(dev, | 1012 | status = cx231xx_read_modify_write_i2c_dword(dev, |
| 1013 | VID_BLK_I2C_ADDRESS, | 1013 | VID_BLK_I2C_ADDRESS, |
| 1014 | VERT_TIM_CTRL, | 1014 | VERT_TIM_CTRL, |
| 1015 | FLD_VBLANK_CNT, 0x24); | 1015 | FLD_VBLANK_CNT, 0x20); |
| 1016 | status = cx231xx_read_modify_write_i2c_dword(dev, | 1016 | status = cx231xx_read_modify_write_i2c_dword(dev, |
| 1017 | VID_BLK_I2C_ADDRESS, | 1017 | VID_BLK_I2C_ADDRESS, |
| 1018 | VERT_TIM_CTRL, | 1018 | VERT_TIM_CTRL, |
| 1019 | FLD_VACTIVE_CNT, | 1019 | FLD_VACTIVE_CNT, |
| 1020 | cx231xx_set_field | 1020 | cx231xx_set_field |
| 1021 | (FLD_VACTIVE_CNT, | 1021 | (FLD_VACTIVE_CNT, |
| 1022 | 0x240)); | 1022 | 0x244)); |
| 1023 | status = cx231xx_read_modify_write_i2c_dword(dev, | 1023 | status = cx231xx_read_modify_write_i2c_dword(dev, |
| 1024 | VID_BLK_I2C_ADDRESS, | 1024 | VID_BLK_I2C_ADDRESS, |
| 1025 | VERT_TIM_CTRL, | 1025 | VERT_TIM_CTRL, |
| 1026 | FLD_V656BLANK_CNT, | 1026 | FLD_V656BLANK_CNT, |
| 1027 | cx231xx_set_field | 1027 | cx231xx_set_field |
| 1028 | (FLD_V656BLANK_CNT, | 1028 | (FLD_V656BLANK_CNT, |
| 1029 | 0x28)); | 1029 | 0x24)); |
| 1030 | /* Adjust the active video horizontal start point */ | 1030 | /* Adjust the active video horizontal start point */ |
| 1031 | status = cx231xx_read_modify_write_i2c_dword(dev, | 1031 | status = cx231xx_read_modify_write_i2c_dword(dev, |
| 1032 | VID_BLK_I2C_ADDRESS, | 1032 | VID_BLK_I2C_ADDRESS, |
| @@ -1039,21 +1039,21 @@ int cx231xx_do_mode_ctrl_overrides(struct cx231xx *dev) | |||
| 1039 | status = cx231xx_read_modify_write_i2c_dword(dev, | 1039 | status = cx231xx_read_modify_write_i2c_dword(dev, |
| 1040 | VID_BLK_I2C_ADDRESS, | 1040 | VID_BLK_I2C_ADDRESS, |
| 1041 | VERT_TIM_CTRL, | 1041 | VERT_TIM_CTRL, |
| 1042 | FLD_VBLANK_CNT, 0x24); | 1042 | FLD_VBLANK_CNT, 0x20); |
| 1043 | status = cx231xx_read_modify_write_i2c_dword(dev, | 1043 | status = cx231xx_read_modify_write_i2c_dword(dev, |
| 1044 | VID_BLK_I2C_ADDRESS, | 1044 | VID_BLK_I2C_ADDRESS, |
| 1045 | VERT_TIM_CTRL, | 1045 | VERT_TIM_CTRL, |
| 1046 | FLD_VACTIVE_CNT, | 1046 | FLD_VACTIVE_CNT, |
| 1047 | cx231xx_set_field | 1047 | cx231xx_set_field |
| 1048 | (FLD_VACTIVE_CNT, | 1048 | (FLD_VACTIVE_CNT, |
| 1049 | 0x240)); | 1049 | 0x244)); |
| 1050 | status = cx231xx_read_modify_write_i2c_dword(dev, | 1050 | status = cx231xx_read_modify_write_i2c_dword(dev, |
| 1051 | VID_BLK_I2C_ADDRESS, | 1051 | VID_BLK_I2C_ADDRESS, |
| 1052 | VERT_TIM_CTRL, | 1052 | VERT_TIM_CTRL, |
| 1053 | FLD_V656BLANK_CNT, | 1053 | FLD_V656BLANK_CNT, |
| 1054 | cx231xx_set_field | 1054 | cx231xx_set_field |
| 1055 | (FLD_V656BLANK_CNT, | 1055 | (FLD_V656BLANK_CNT, |
| 1056 | 0x28)); | 1056 | 0x24)); |
| 1057 | /* Adjust the active video horizontal start point */ | 1057 | /* Adjust the active video horizontal start point */ |
| 1058 | status = cx231xx_read_modify_write_i2c_dword(dev, | 1058 | status = cx231xx_read_modify_write_i2c_dword(dev, |
| 1059 | VID_BLK_I2C_ADDRESS, | 1059 | VID_BLK_I2C_ADDRESS, |