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