1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
|
From cf3885ed8bb4194c5653a9a933b4ea669cdb51c2 Mon Sep 17 00:00:00 2001
From: Naushir Patuck <naush@raspberrypi.com>
Date: Wed, 9 Dec 2020 11:30:12 +0000
Subject: [PATCH] media: i2c: imx477: Selection compliance fixes
To comply with the intended usage of the V4L2 selection target when
used to retrieve a sensor image properties, adjust the rectangles
returned by the imx477 driver.
The top/left crop coordinates of the TGT_CROP rectangle were set to
(0, 0) instead of (8, 16) which is the offset from the larger physical
pixel array rectangle. This was also a mismatch with the default values
crop rectangle value, so this is corrected. Found with v4l2-compliance.
While at it, add V4L2_SEL_TGT_CROP_BOUNDS support: CROP_DEFAULT and
CROP_BOUNDS have the same size as the non-active pixels are not readable
using the selection API. Found with v4l2-compliance.
This commit mirrors 543790f777ba1b3264c168c653db6d415e7c983f done for
the imx219 sensor.
Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
---
drivers/media/i2c/imx477.c | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
--- a/drivers/media/i2c/imx477.c
+++ b/drivers/media/i2c/imx477.c
@@ -900,8 +900,8 @@ static const struct imx477_mode supporte
.height = 3040,
.line_length_pix = 0x5dc0,
.crop = {
- .left = 0,
- .top = 0,
+ .left = IMX477_PIXEL_ARRAY_LEFT,
+ .top = IMX477_PIXEL_ARRAY_TOP,
.width = 4056,
.height = 3040,
},
@@ -924,8 +924,8 @@ static const struct imx477_mode supporte
.height = 1520,
.line_length_pix = 0x31c4,
.crop = {
- .left = 0,
- .top = 0,
+ .left = IMX477_PIXEL_ARRAY_LEFT,
+ .top = IMX477_PIXEL_ARRAY_TOP,
.width = 4056,
.height = 3040,
},
@@ -948,8 +948,8 @@ static const struct imx477_mode supporte
.height = 1080,
.line_length_pix = 0x31c4,
.crop = {
- .left = 0,
- .top = 440,
+ .left = IMX477_PIXEL_ARRAY_LEFT,
+ .top = IMX477_PIXEL_ARRAY_TOP + 440,
.width = 4056,
.height = 2600,
},
@@ -983,8 +983,8 @@ static const struct imx477_mode supporte
* rectangle once the driver is expanded to represent
* its processing blocks with multiple subdevs.
*/
- .left = 4,
- .top = 0,
+ .left = IMX477_PIXEL_ARRAY_LEFT + 4,
+ .top = IMX477_PIXEL_ARRAY_TOP,
.width = 4052,
.height = 3040,
},
@@ -1696,6 +1696,7 @@ static int imx477_get_selection(struct v
return 0;
case V4L2_SEL_TGT_CROP_DEFAULT:
+ case V4L2_SEL_TGT_CROP_BOUNDS:
sel->r.left = IMX477_PIXEL_ARRAY_LEFT;
sel->r.top = IMX477_PIXEL_ARRAY_TOP;
sel->r.width = IMX477_PIXEL_ARRAY_WIDTH;
|
