projects / openwrt / staging / jow.git / blob
? search:


838d6b2cf8b1e1472c9f4682b0cc92bd6d11a3d4
[openwrt/staging/jow.git] / target / linux / at91 / patches-5.10 / 157-media-atmel-atmel-isc-specialize-gamma-table-into-pr.patch
1 From c3f54d192dc7344c5216a3628b67c4bbccbf8c3c Mon Sep 17 00:00:00 2001
2 From: Eugen Hristev <eugen.hristev@microchip.com>
3 Date: Tue, 13 Apr 2021 12:56:59 +0200
4 Subject: [PATCH 157/247] media: atmel: atmel-isc: specialize gamma table into
5 product specific
6
7 Separate the gamma table from the isc base file into the specific sama5d2
8 product file.
9 Add a pointer to the gamma table and entries count inside the platform
10 driver specific struct.
11
12 [hverkuil: made isc_sama5d2_gamma_table static]
13
14 Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
15 Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
16 Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
17 ---
18 drivers/media/platform/atmel/atmel-isc-base.c | 47 ++-----------------
19 drivers/media/platform/atmel/atmel-isc.h | 11 +++--
20 .../media/platform/atmel/atmel-sama5d2-isc.c | 45 ++++++++++++++++++
21 3 files changed, 56 insertions(+), 47 deletions(-)
22
23 diff --git a/drivers/media/platform/atmel/atmel-isc-base.c b/drivers/media/platform/atmel/atmel-isc-base.c
24 index a017572c870c..46d384332a58 100644
25 --- a/drivers/media/platform/atmel/atmel-isc-base.c
26 +++ b/drivers/media/platform/atmel/atmel-isc-base.c
27 @@ -176,48 +176,6 @@ struct isc_format formats_list[] = {
28
29 };
30
31 -/* Gamma table with gamma 1/2.2 */
32 -const u32 isc_gamma_table[GAMMA_MAX + 1][GAMMA_ENTRIES] = {
33 - /* 0 --> gamma 1/1.8 */
34 - { 0x65, 0x66002F, 0x950025, 0xBB0020, 0xDB001D, 0xF8001A,
35 - 0x1130018, 0x12B0017, 0x1420016, 0x1580014, 0x16D0013, 0x1810012,
36 - 0x1940012, 0x1A60012, 0x1B80011, 0x1C90010, 0x1DA0010, 0x1EA000F,
37 - 0x1FA000F, 0x209000F, 0x218000F, 0x227000E, 0x235000E, 0x243000E,
38 - 0x251000E, 0x25F000D, 0x26C000D, 0x279000D, 0x286000D, 0x293000C,
39 - 0x2A0000C, 0x2AC000C, 0x2B8000C, 0x2C4000C, 0x2D0000B, 0x2DC000B,
40 - 0x2E7000B, 0x2F3000B, 0x2FE000B, 0x309000B, 0x314000B, 0x31F000A,
41 - 0x32A000A, 0x334000B, 0x33F000A, 0x349000A, 0x354000A, 0x35E000A,
42 - 0x368000A, 0x372000A, 0x37C000A, 0x386000A, 0x3900009, 0x399000A,
43 - 0x3A30009, 0x3AD0009, 0x3B60009, 0x3BF000A, 0x3C90009, 0x3D20009,
44 - 0x3DB0009, 0x3E40009, 0x3ED0009, 0x3F60009 },
45 -
46 - /* 1 --> gamma 1/2 */
47 - { 0x7F, 0x800034, 0xB50028, 0xDE0021, 0x100001E, 0x11E001B,
48 - 0x1390019, 0x1520017, 0x16A0015, 0x1800014, 0x1940014, 0x1A80013,
49 - 0x1BB0012, 0x1CD0011, 0x1DF0010, 0x1EF0010, 0x200000F, 0x20F000F,
50 - 0x21F000E, 0x22D000F, 0x23C000E, 0x24A000E, 0x258000D, 0x265000D,
51 - 0x273000C, 0x27F000D, 0x28C000C, 0x299000C, 0x2A5000C, 0x2B1000B,
52 - 0x2BC000C, 0x2C8000B, 0x2D3000C, 0x2DF000B, 0x2EA000A, 0x2F5000A,
53 - 0x2FF000B, 0x30A000A, 0x314000B, 0x31F000A, 0x329000A, 0x333000A,
54 - 0x33D0009, 0x3470009, 0x350000A, 0x35A0009, 0x363000A, 0x36D0009,
55 - 0x3760009, 0x37F0009, 0x3880009, 0x3910009, 0x39A0009, 0x3A30009,
56 - 0x3AC0008, 0x3B40009, 0x3BD0008, 0x3C60008, 0x3CE0008, 0x3D60009,
57 - 0x3DF0008, 0x3E70008, 0x3EF0008, 0x3F70008 },
58 -
59 - /* 2 --> gamma 1/2.2 */
60 - { 0x99, 0x9B0038, 0xD4002A, 0xFF0023, 0x122001F, 0x141001B,
61 - 0x15D0019, 0x1760017, 0x18E0015, 0x1A30015, 0x1B80013, 0x1CC0012,
62 - 0x1DE0011, 0x1F00010, 0x2010010, 0x2110010, 0x221000F, 0x230000F,
63 - 0x23F000E, 0x24D000E, 0x25B000D, 0x269000C, 0x276000C, 0x283000C,
64 - 0x28F000C, 0x29B000C, 0x2A7000C, 0x2B3000B, 0x2BF000B, 0x2CA000B,
65 - 0x2D5000B, 0x2E0000A, 0x2EB000A, 0x2F5000A, 0x2FF000A, 0x30A000A,
66 - 0x3140009, 0x31E0009, 0x327000A, 0x3310009, 0x33A0009, 0x3440009,
67 - 0x34D0009, 0x3560009, 0x35F0009, 0x3680008, 0x3710008, 0x3790009,
68 - 0x3820008, 0x38A0008, 0x3930008, 0x39B0008, 0x3A30008, 0x3AB0008,
69 - 0x3B30008, 0x3BB0008, 0x3C30008, 0x3CB0007, 0x3D20008, 0x3DA0007,
70 - 0x3E20007, 0x3E90007, 0x3F00008, 0x3F80007 },
71 -};
72 -
73 #define ISC_IS_FORMAT_RAW(mbus_code) \
74 (((mbus_code) & 0xf000) == 0x3000)
75
76 @@ -691,7 +649,7 @@ static void isc_set_pipeline(struct isc_device *isc, u32 pipeline)
77
78 regmap_write(regmap, ISC_CFA_CFG, bay_cfg | ISC_CFA_CFG_EITPOL);
79
80 - gamma = &isc_gamma_table[ctrls->gamma_index][0];
81 + gamma = &isc->gamma_table[ctrls->gamma_index][0];
82 regmap_bulk_write(regmap, ISC_GAM_BENTRY, gamma, GAMMA_ENTRIES);
83 regmap_bulk_write(regmap, ISC_GAM_GENTRY, gamma, GAMMA_ENTRIES);
84 regmap_bulk_write(regmap, ISC_GAM_RENTRY, gamma, GAMMA_ENTRIES);
85 @@ -2085,7 +2043,8 @@ static int isc_ctrl_init(struct isc_device *isc)
86
87 v4l2_ctrl_new_std(hdl, ops, V4L2_CID_BRIGHTNESS, -1024, 1023, 1, 0);
88 v4l2_ctrl_new_std(hdl, ops, V4L2_CID_CONTRAST, -2048, 2047, 1, 256);
89 - v4l2_ctrl_new_std(hdl, ops, V4L2_CID_GAMMA, 0, GAMMA_MAX, 1, 2);
90 + v4l2_ctrl_new_std(hdl, ops, V4L2_CID_GAMMA, 0, isc->gamma_max, 1,
91 + isc->gamma_max);
92 isc->awb_ctrl = v4l2_ctrl_new_std(hdl, &isc_awb_ops,
93 V4L2_CID_AUTO_WHITE_BALANCE,
94 0, 1, 1, 1);
95 diff --git a/drivers/media/platform/atmel/atmel-isc.h b/drivers/media/platform/atmel/atmel-isc.h
96 index 24b784b893d6..a85b99274e34 100644
97 --- a/drivers/media/platform/atmel/atmel-isc.h
98 +++ b/drivers/media/platform/atmel/atmel-isc.h
99 @@ -186,6 +186,10 @@ struct isc_ctrls {
100 *
101 * @current_subdev: current subdevice: the sensor
102 * @subdev_entities: list of subdevice entitites
103 + *
104 + * @gamma_table: pointer to the table with gamma values, has
105 + * gamma_max sets of GAMMA_ENTRIES entries each
106 + * @gamma_max: maximum number of sets of inside the gamma_table
107 */
108 struct isc_device {
109 struct regmap *regmap;
110 @@ -244,16 +248,17 @@ struct isc_device {
111 struct v4l2_ctrl *gr_off_ctrl;
112 struct v4l2_ctrl *gb_off_ctrl;
113 };
114 -};
115
116 -#define GAMMA_MAX 2
117 #define GAMMA_ENTRIES 64
118 + /* pointer to the defined gamma table */
119 + const u32 (*gamma_table)[GAMMA_ENTRIES];
120 + u32 gamma_max;
121 +};
122
123 #define ATMEL_ISC_NAME "atmel-isc"
124
125 extern struct isc_format formats_list[];
126 extern const struct isc_format controller_formats[];
127 -extern const u32 isc_gamma_table[GAMMA_MAX + 1][GAMMA_ENTRIES];
128 extern const struct regmap_config isc_regmap_config;
129 extern const struct v4l2_async_notifier_operations isc_async_ops;
130
131 diff --git a/drivers/media/platform/atmel/atmel-sama5d2-isc.c b/drivers/media/platform/atmel/atmel-sama5d2-isc.c
132 index a3304f49e499..1b537cd1e09e 100644
133 --- a/drivers/media/platform/atmel/atmel-sama5d2-isc.c
134 +++ b/drivers/media/platform/atmel/atmel-sama5d2-isc.c
135 @@ -54,6 +54,48 @@
136
137 #define ISC_CLK_MAX_DIV 255
138
139 +/* Gamma table with gamma 1/2.2 */
140 +static const u32 isc_sama5d2_gamma_table[][GAMMA_ENTRIES] = {
141 + /* 0 --> gamma 1/1.8 */
142 + { 0x65, 0x66002F, 0x950025, 0xBB0020, 0xDB001D, 0xF8001A,
143 + 0x1130018, 0x12B0017, 0x1420016, 0x1580014, 0x16D0013, 0x1810012,
144 + 0x1940012, 0x1A60012, 0x1B80011, 0x1C90010, 0x1DA0010, 0x1EA000F,
145 + 0x1FA000F, 0x209000F, 0x218000F, 0x227000E, 0x235000E, 0x243000E,
146 + 0x251000E, 0x25F000D, 0x26C000D, 0x279000D, 0x286000D, 0x293000C,
147 + 0x2A0000C, 0x2AC000C, 0x2B8000C, 0x2C4000C, 0x2D0000B, 0x2DC000B,
148 + 0x2E7000B, 0x2F3000B, 0x2FE000B, 0x309000B, 0x314000B, 0x31F000A,
149 + 0x32A000A, 0x334000B, 0x33F000A, 0x349000A, 0x354000A, 0x35E000A,
150 + 0x368000A, 0x372000A, 0x37C000A, 0x386000A, 0x3900009, 0x399000A,
151 + 0x3A30009, 0x3AD0009, 0x3B60009, 0x3BF000A, 0x3C90009, 0x3D20009,
152 + 0x3DB0009, 0x3E40009, 0x3ED0009, 0x3F60009 },
153 +
154 + /* 1 --> gamma 1/2 */
155 + { 0x7F, 0x800034, 0xB50028, 0xDE0021, 0x100001E, 0x11E001B,
156 + 0x1390019, 0x1520017, 0x16A0015, 0x1800014, 0x1940014, 0x1A80013,
157 + 0x1BB0012, 0x1CD0011, 0x1DF0010, 0x1EF0010, 0x200000F, 0x20F000F,
158 + 0x21F000E, 0x22D000F, 0x23C000E, 0x24A000E, 0x258000D, 0x265000D,
159 + 0x273000C, 0x27F000D, 0x28C000C, 0x299000C, 0x2A5000C, 0x2B1000B,
160 + 0x2BC000C, 0x2C8000B, 0x2D3000C, 0x2DF000B, 0x2EA000A, 0x2F5000A,
161 + 0x2FF000B, 0x30A000A, 0x314000B, 0x31F000A, 0x329000A, 0x333000A,
162 + 0x33D0009, 0x3470009, 0x350000A, 0x35A0009, 0x363000A, 0x36D0009,
163 + 0x3760009, 0x37F0009, 0x3880009, 0x3910009, 0x39A0009, 0x3A30009,
164 + 0x3AC0008, 0x3B40009, 0x3BD0008, 0x3C60008, 0x3CE0008, 0x3D60009,
165 + 0x3DF0008, 0x3E70008, 0x3EF0008, 0x3F70008 },
166 +
167 + /* 2 --> gamma 1/2.2 */
168 + { 0x99, 0x9B0038, 0xD4002A, 0xFF0023, 0x122001F, 0x141001B,
169 + 0x15D0019, 0x1760017, 0x18E0015, 0x1A30015, 0x1B80013, 0x1CC0012,
170 + 0x1DE0011, 0x1F00010, 0x2010010, 0x2110010, 0x221000F, 0x230000F,
171 + 0x23F000E, 0x24D000E, 0x25B000D, 0x269000C, 0x276000C, 0x283000C,
172 + 0x28F000C, 0x29B000C, 0x2A7000C, 0x2B3000B, 0x2BF000B, 0x2CA000B,
173 + 0x2D5000B, 0x2E0000A, 0x2EB000A, 0x2F5000A, 0x2FF000A, 0x30A000A,
174 + 0x3140009, 0x31E0009, 0x327000A, 0x3310009, 0x33A0009, 0x3440009,
175 + 0x34D0009, 0x3560009, 0x35F0009, 0x3680008, 0x3710008, 0x3790009,
176 + 0x3820008, 0x38A0008, 0x3930008, 0x39B0008, 0x3A30008, 0x3AB0008,
177 + 0x3B30008, 0x3BB0008, 0x3C30008, 0x3CB0007, 0x3D20008, 0x3DA0007,
178 + 0x3E20007, 0x3E90007, 0x3F00008, 0x3F80007 },
179 +};
180 +
181 static int isc_parse_dt(struct device *dev, struct isc_device *isc)
182 {
183 struct device_node *np = dev->of_node;
184 @@ -171,6 +213,9 @@ static int atmel_isc_probe(struct platform_device *pdev)
185 return ret;
186 }
187
188 + isc->gamma_table = isc_sama5d2_gamma_table;
189 + isc->gamma_max = 2;
190 +
191 ret = isc_pipeline_init(isc);
192 if (ret)
193 return ret;
194 --
195 2.32.0
196
Staging tree of Jo-Philipp Wich