Home Explore Help
Sign In
PUBLIC_REPOS
/
ti-processor-sdk-linux
2
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

media: adv*/tc358743/ths8200: fill in min width/height/pixelclock

[ Upstream commit 2912289a518077ddb8214e05336700148e97e235 ]

The v4l2_dv_timings_cap struct is used to do sanity checks when setting and
enumerating DV timings, ensuring that only valid timings as per the HW
capabilities are allowed.

However, many drivers just filled in 0 for the minimum width, height or
pixelclock frequency. This can cause timings with e.g. 0 as width and height
to be accepted, which will in turn lead to a potential division by zero.

Fill in proper values are minimum boundaries. 640x350 was chosen since it is
the smallest resolution in v4l2-dv-timings.h. Same for 13 MHz as the lowest
pixelclock frequency (it's slightly below the minimum of 13.5 MHz in the
v4l2-dv-timings.h header).

Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Hans Verkuil 7 years ago
parent
9c0403537e
commit
b945ddacf4
6 changed files with 8 additions and 8 deletions
Split View Show Diff Stats
  1. 1 1
      drivers/media/i2c/ad9389b.c
  2. 1 1
      drivers/media/i2c/adv7511.c
  3. 2 2
      drivers/media/i2c/adv7604.c
  4. 2 2
      drivers/media/i2c/adv7842.c
  5. 1 1
      drivers/media/i2c/tc358743.c
  6. 1 1
      drivers/media/i2c/ths8200.c

+ 1 - 1
drivers/media/i2c/ad9389b.c
View File 

@@ -578,7 +578,7 @@ static const struct v4l2_dv_timings_cap ad9389b_timings_cap = {
 
 	.type = V4L2_DV_BT_656_1120,
 
 	/* keep this initialization for compatibility with GCC < 4.4.6 */
 
 	.reserved = { 0 },
 
-	V4L2_INIT_BT_TIMINGS(0, 1920, 0, 1200, 25000000, 170000000,
 
+	V4L2_INIT_BT_TIMINGS(640, 1920, 350, 1200, 25000000, 170000000,
 
 		V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT |
 
 			V4L2_DV_BT_STD_GTF | V4L2_DV_BT_STD_CVT,
 
 		V4L2_DV_BT_CAP_PROGRESSIVE | V4L2_DV_BT_CAP_REDUCED_BLANKING |

+ 1 - 1
drivers/media/i2c/adv7511.c
View File 

@@ -130,7 +130,7 @@ static const struct v4l2_dv_timings_cap adv7511_timings_cap = {
 
 	.type = V4L2_DV_BT_656_1120,
 
 	/* keep this initialization for compatibility with GCC < 4.4.6 */
 
 	.reserved = { 0 },
 
-	V4L2_INIT_BT_TIMINGS(0, ADV7511_MAX_WIDTH, 0, ADV7511_MAX_HEIGHT,
 
+	V4L2_INIT_BT_TIMINGS(640, ADV7511_MAX_WIDTH, 350, ADV7511_MAX_HEIGHT,
 
 		ADV7511_MIN_PIXELCLOCK, ADV7511_MAX_PIXELCLOCK,
 
 		V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT |
 
 			V4L2_DV_BT_STD_GTF | V4L2_DV_BT_STD_CVT,

+ 2 - 2
drivers/media/i2c/adv7604.c
View File 

@@ -766,7 +766,7 @@ static const struct v4l2_dv_timings_cap adv7604_timings_cap_analog = {
 
 	.type = V4L2_DV_BT_656_1120,
 
 	/* keep this initialization for compatibility with GCC < 4.4.6 */
 
 	.reserved = { 0 },
 
-	V4L2_INIT_BT_TIMINGS(0, 1920, 0, 1200, 25000000, 170000000,
 
+	V4L2_INIT_BT_TIMINGS(640, 1920, 350, 1200, 25000000, 170000000,
 
 		V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT |
 
 			V4L2_DV_BT_STD_GTF | V4L2_DV_BT_STD_CVT,
 
 		V4L2_DV_BT_CAP_PROGRESSIVE | V4L2_DV_BT_CAP_REDUCED_BLANKING |
 
@@ -777,7 +777,7 @@ static const struct v4l2_dv_timings_cap adv76xx_timings_cap_digital = {
 
 	.type = V4L2_DV_BT_656_1120,
 
 	/* keep this initialization for compatibility with GCC < 4.4.6 */
 
 	.reserved = { 0 },
 
-	V4L2_INIT_BT_TIMINGS(0, 1920, 0, 1200, 25000000, 225000000,
 
+	V4L2_INIT_BT_TIMINGS(640, 1920, 350, 1200, 25000000, 225000000,
 
 		V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT |
 
 			V4L2_DV_BT_STD_GTF | V4L2_DV_BT_STD_CVT,
 
 		V4L2_DV_BT_CAP_PROGRESSIVE | V4L2_DV_BT_CAP_REDUCED_BLANKING |

+ 2 - 2
drivers/media/i2c/adv7842.c
View File 

@@ -663,7 +663,7 @@ static const struct v4l2_dv_timings_cap adv7842_timings_cap_analog = {
 
 	.type = V4L2_DV_BT_656_1120,
 
 	/* keep this initialization for compatibility with GCC < 4.4.6 */
 
 	.reserved = { 0 },
 
-	V4L2_INIT_BT_TIMINGS(0, 1920, 0, 1200, 25000000, 170000000,
 
+	V4L2_INIT_BT_TIMINGS(640, 1920, 350, 1200, 25000000, 170000000,
 
 		V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT |
 
 			V4L2_DV_BT_STD_GTF | V4L2_DV_BT_STD_CVT,
 
 		V4L2_DV_BT_CAP_PROGRESSIVE | V4L2_DV_BT_CAP_REDUCED_BLANKING |
 
@@ -674,7 +674,7 @@ static const struct v4l2_dv_timings_cap adv7842_timings_cap_digital = {
 
 	.type = V4L2_DV_BT_656_1120,
 
 	/* keep this initialization for compatibility with GCC < 4.4.6 */
 
 	.reserved = { 0 },
 
-	V4L2_INIT_BT_TIMINGS(0, 1920, 0, 1200, 25000000, 225000000,
 
+	V4L2_INIT_BT_TIMINGS(640, 1920, 350, 1200, 25000000, 225000000,
 
 		V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT |
 
 			V4L2_DV_BT_STD_GTF | V4L2_DV_BT_STD_CVT,
 
 		V4L2_DV_BT_CAP_PROGRESSIVE | V4L2_DV_BT_CAP_REDUCED_BLANKING |

+ 1 - 1
drivers/media/i2c/tc358743.c
View File 

@@ -59,7 +59,7 @@ static const struct v4l2_dv_timings_cap tc358743_timings_cap = {
 
 	/* keep this initialization for compatibility with GCC < 4.4.6 */
 
 	.reserved = { 0 },
 
 	/* Pixel clock from REF_01 p. 20. Min/max height/width are unknown */
 
-	V4L2_INIT_BT_TIMINGS(1, 10000, 1, 10000, 0, 165000000,
 
+	V4L2_INIT_BT_TIMINGS(640, 1920, 350, 1200, 13000000, 165000000,
 
 			V4L2_DV_BT_STD_CEA861 | V4L2_DV_BT_STD_DMT |
 
 			V4L2_DV_BT_STD_GTF | V4L2_DV_BT_STD_CVT,
 
 			V4L2_DV_BT_CAP_PROGRESSIVE |

+ 1 - 1
drivers/media/i2c/ths8200.c
View File 

@@ -49,7 +49,7 @@ static const struct v4l2_dv_timings_cap ths8200_timings_cap = {
 
 	.type = V4L2_DV_BT_656_1120,
 
 	/* keep this initialization for compatibility with GCC < 4.4.6 */
 
 	.reserved = { 0 },
 
-	V4L2_INIT_BT_TIMINGS(0, 1920, 0, 1080, 25000000, 148500000,
 
+	V4L2_INIT_BT_TIMINGS(640, 1920, 350, 1080, 25000000, 148500000,
 
 		V4L2_DV_BT_STD_CEA861, V4L2_DV_BT_CAP_PROGRESSIVE)
 
 };