IFE register cleanup (#33854)

* remove first update

* no duplicates

* fix build

* lil more

* lil more

* lil more

* cleanup

---------

Co-authored-by: Comma Device <device@comma.ai>

system/camerad/cameras/ife.h

@@ -4,8 +4,7 @@
 #include "system/camerad/sensors/sensor.h"
 
 
-int build_initial_config(uint8_t *dst, const SensorInfo *s, std::vector<uint32_t> &patches) {
+int build_update(uint8_t *dst, const SensorInfo *s, std::vector<uint32_t> &patches) {
-  uint64_t addr;
   uint8_t *start = dst;
 
   dst += write_random(dst, {
@@ -16,26 +15,94 @@ int build_initial_config(uint8_t *dst, const SensorInfo *s, std::vector<uint32_t
     0x3c, 0xffffffff,
   });
 
+  dst += write_cont(dst, 0x560, {
+    0x00000001,
+    0x04440444,
+    0x04450445,
+    0x04440444,
+    0x04450445,
+    0x000000ca,
+    0x0000009c,
+  });
+
+  // white balance
+  dst += write_cont(dst, 0x6fc, {
+    0x00800080,
+    0x00000080,
+    0x00000000,
+    0x00000000,
+  });
+
+  dst += write_cont(dst, 0x40, {
+    0x00000c04,
+  });
+
+  dst += write_cont(dst, 0x48, {
+    (1 << 3) | (1 << 1),
+  });
+
+  dst += write_cont(dst, 0x4c, {
+    0x00000019,
+  });
+
+  dst += write_cont(dst, 0xe0c, {
+    0x00000e00,
+  });
+
+  dst += write_cont(dst, 0xe2c, {
+    0x00000e00,
+  });
+
+  dst += write_cont(dst, 0x44, {
+    0x00000000,
+  });
+
+  dst += write_cont(dst, 0xaac, {
+    0x00000000,
+  });
+
+  dst += write_cont(dst, 0xf00, {
+    0x00000000,
+  });
+
+  // black level scale + offset
+  dst += write_cont(dst, 0x6b0, {
+    (((uint32_t)(1 << s->bits_per_pixel) - 1) << 0xf) | (s->black_level << 0),
+    0x0,
+    0x0,
+  });
+
+  return dst - start;
+}
+
+
+int build_initial_config(uint8_t *dst, const SensorInfo *s, std::vector<uint32_t> &patches) {
+  uint8_t *start = dst;
+
+  // start with the every frame config
+  dst += build_update(dst, s, patches);
+
+  uint64_t addr;
+
+  // setup
   dst += write_cont(dst, 0x478, {
     0x00000004,
     0x004000c0,
   });
-
   dst += write_cont(dst, 0x488, {
     0x00000000,
     0x00000000,
     0x00000f0f,
   });
-
   dst += write_cont(dst, 0x49c, {
     0x00000001,
   });
-
   dst += write_cont(dst, 0xce4, {
     0x00000000,
     0x00000000,
   });
 
+  // linearization
   dst += write_cont(dst, 0x4dc, {
     0x00000000,
     0x04050b84,
@@ -84,54 +151,7 @@ int build_initial_config(uint8_t *dst, const SensorInfo *s, std::vector<uint32_t
     .DMISel = 9
   */
 
-  dst += write_cont(dst, 0x560, {
+  // vignetting correction
-    0x00000001,
-    0x04440444,
-    0x04450445,
-    0x04440444,
-    0x04450445,
-    0x000000ca,
-    0x0000009c,
-  });
-
-  dst += write_cont(dst, 0x5e8, {
-    0x06363005,
-  });
-
-  dst += write_cont(dst, 0x5f4, {
-    0x00000000,
-    0x00000000,
-    0x00000000,
-    0x00000000,
-    0x3b3839a0,
-    0x003f8040,
-    0x00000000,
-    0x00000000,
-    0x00078000,
-    0x00078000,
-    0x00078000,
-    0x00078000,
-    0x00078000,
-    0x00078000,
-    0x00078000,
-    0x00078000,
-    0x00000009,
-    0x00400808,
-    0x00000044,
-    0x004000a0,
-    0x0a0d00a6,
-    0x0a0d00a6,
-  });
-  /* TODO
-  cdm_dmi_cmd_t 392
-    .length = 255
-    .reserved = 33
-    .cmd = 10
-    .addr = 0
-    .DMIAddr = 3108
-    .DMISel = 12
-  */
-
   dst += write_cont(dst, 0x6bc, {
     0x0b3c0000,
     0x00670067,
@@ -164,22 +184,16 @@ int build_initial_config(uint8_t *dst, const SensorInfo *s, std::vector<uint32_t
     .DMISel = 15
   */
 
-  dst += write_cont(dst, 0x6fc, {
+  // debayer
-    0x00bf0080,
-    0x00000106,
-    0x00000000,
-    0x00000000,
-  });
-
   dst += write_cont(dst, 0x6f8, {
     0x00000100,
   });
-
   dst += write_cont(dst, 0x71c, {
     0x00008000,
     0x08000066,
   });
 
+  // color correction
   dst += write_cont(dst, 0x760, s->color_correct_matrix);
 
   // gamma
@@ -193,6 +207,7 @@ int build_initial_config(uint8_t *dst, const SensorInfo *s, std::vector<uint32_t
   dst += write_dmi(dst, &addr, 256, 0xc24, 30);  // R
   patches.push_back(addr - (uint64_t)start);
 
+  // YUV
   dst += write_cont(dst, 0xf30, {
     0x00750259,
     0x00000132,
@@ -208,6 +223,7 @@ int build_initial_config(uint8_t *dst, const SensorInfo *s, std::vector<uint32_t
     0x03ff0000,
   });
 
+  // TODO: remove this
   dst += write_cont(dst, 0xa3c, {
     0x00000003,
     0x07870787,
@@ -221,7 +237,6 @@ int build_initial_config(uint8_t *dst, const SensorInfo *s, std::vector<uint32_t
     0x00000000,
     0x000004b7,
   });
-
   dst += write_cont(dst, 0xa68, {
     0x00000003,
     0x03c30787,
@@ -236,412 +251,25 @@ int build_initial_config(uint8_t *dst, const SensorInfo *s, std::vector<uint32_t
     0x00000787,
   });
 
-
+  // cropping
   dst += write_cont(dst, 0xe10, {
-    0x000004b7,
+    s->frame_height - 1,
-    0x00000787,
+    s->frame_width - 1,
   });
-
   dst += write_cont(dst, 0xe30, {
-    0x0000025b,
+    s->frame_height/2 - 1,
-    0x00000787,
+    s->frame_width - 1,
   });
-
   dst += write_cont(dst, 0xe18, {
     0x0ff00000,
     0x00000016,
   });
-
   dst += write_cont(dst, 0xe38, {
     0x0ff00000,
     0x00000017,
   });
 
-  dst += write_cont(dst, 0xd84, {
-    0x000004b7,
-    0x00000787,
-  });
-
-  dst += write_cont(dst, 0xda4, {
-    0x000004b7,
-    0x00000787,
-  });
-
-  dst += write_cont(dst, 0xd60, {
-    0x04380300,
-    0x09016c7d,
-    0x021c0300,
-  });
-
-  dst += write_cont(dst, 0xd98, {
-    0x0ff00000,
-    0x00000016,
-  });
-
-  dst += write_cont(dst, 0xdb8, {
-    0x0ff00000,
-    0x00000017,
-  });
-
-  dst += write_cont(dst, 0xd6c, {
-    0x00000300,
-  });
-
-  dst += write_cont(dst, 0xd70, {
-    0x010e0f00,
-    0x09016c7d,
-    0x00870f00,
-  });
-
-  dst += write_cont(dst, 0xd7c, {
-    0x00000f00,
-  });
-
-  dst += write_cont(dst, 0x40, {
-    0x00000c06,
-  });
-
-  dst += write_cont(dst, 0x48, {
-    0x0000000e,
-  });
-
-  dst += write_cont(dst, 0x4c, {
-    0x00000019,
-  });
-
-  dst += write_cont(dst, 0xe4c, {
-    0x00000000,
-  });
-
-  dst += write_cont(dst, 0xe6c, {
-    0x00000000,
-  });
-
-  dst += write_cont(dst, 0xe0c, {
-    0x00000e00,
-  });
-
-  dst += write_cont(dst, 0xe2c, {
-    0x00000e00,
-  });
-
-  dst += write_cont(dst, 0xd8c, {
-    0x00000000,
-  });
-
-  dst += write_cont(dst, 0xdac, {
-    0x00000000,
-  });
-
-  dst += write_cont(dst, 0xdcc, {
-    0x00000000,
-  });
-
-  dst += write_cont(dst, 0xdec, {
-    0x00000000,
-  });
-
-  dst += write_cont(dst, 0x44, {
-    0x00000000,
-  });
-
-  dst += write_cont(dst, 0xaac, {
-    0x00000040,
-  });
-
-  dst += write_cont(dst, 0xf00, {
-    0x00000000,
-  });
-
-  //hexdump(start, dst - start);
-  return dst - start;
-}
-
-int build_first_update(uint8_t *dst) {
-  uint8_t *start = dst;
-
-  dst += write_random(dst, {
-    0x2c, 0xffffffff,
-    0x30, 0xffffffff,
-    0x34, 0xffffffff,
-    0x38, 0xffffffff,
-    0x3c, 0xffffffff,
-  });
-
-  dst += write_cont(dst, 0x560, {
-    0x00000001,
-    0x04440444,
-    0x04450445,
-    0x04440444,
-    0x04450445,
-    0x000000ca,
-    0x0000009c,
-  });
-
-  dst += write_cont(dst, 0x5c4, {
-    0x00000000,
-    0x00001000,
-    0x00001000,
-    0x00001000,
-    0x00001000,
-    0x00800080,
-    0x00802040,
-    0x00000000,
-  });
-
-  dst += write_cont(dst, 0x5e8, {
-    0x06363007,
-  });
-
-  dst += write_cont(dst, 0x5f4, {
-    0x00000000,
-    0x00000000,
-    0x00000000,
-    0x00000000,
-    0x3b3839a0,
-    0x003f8040,
-    0x00000000,
-    0x00000000,
-    0x00078000,
-    0x00078000,
-    0x00078000,
-    0x00078000,
-    0x00078000,
-    0x00078000,
-    0x00078000,
-    0x00078000,
-    0x00000009,
-    0x00400808,
-    0x00000044,
-    0x004000a0,
-    0x0a0d00a6,
-    0x0a0d00a6,
-  });
-  /* TODO
-  cdm_dmi_cmd_t 368
-    .length = 255
-    .reserved = 33
-    .cmd = 10
-    .addr = 5344
-    .DMIAddr = 3108
-    .DMISel = 13
-  */
-
-  dst += write_cont(dst, 0x6fc, {
-    0x00800080,
-    0x00000080,
-    0x00000000,
-    0x00000000,
-  });
-
-  dst += write_cont(dst, 0x6f8, {
-    0x00000100,
-  });
-
-  dst += write_cont(dst, 0x71c, {
-    0x00008000,
-    0x08000066,
-  });
-
-  dst += write_cont(dst, 0xd84, {
-    0x000004b7,
-    0x00000787,
-  });
-
-  dst += write_cont(dst, 0xda4, {
-    0x000004b7,
-    0x00000787,
-  });
-
-  dst += write_cont(dst, 0xd6c, {
-    0x00000300,
-  });
-
-  dst += write_cont(dst, 0xd70, {
-    0x02640f00,
-    0x09016c7d,
-    0x01320f00,
-  });
-
-  dst += write_cont(dst, 0xd7c, {
-    0x00000f00,
-  });
-
-  dst += write_cont(dst, 0x40, {
-    0x00000c06,
-  });
-
-  dst += write_cont(dst, 0x48, {
-    0x00000000,
-  });
-
-  dst += write_cont(dst, 0x4c, {
-    0x00000019,
-  });
-
-  dst += write_cont(dst, 0xe4c, {
-    0x00000000,
-  });
-
-  dst += write_cont(dst, 0xe6c, {
-    0x00000000,
-  });
-
-  dst += write_cont(dst, 0xe0c, {
-    0x00000e00,
-  });
-
-  dst += write_cont(dst, 0xe2c, {
-    0x00000e00,
-  });
-
-  dst += write_cont(dst, 0xd8c, {
-    0x00000000,
-  });
-
-  dst += write_cont(dst, 0xdac, {
-    0x00000000,
-  });
-
-  dst += write_cont(dst, 0xdcc, {
-    0x00000000,
-  });
-
-  dst += write_cont(dst, 0xdec, {
-    0x00000000,
-  });
-
-  dst += write_cont(dst, 0x44, {
-    0x00000000,
-  });
-
-  dst += write_cont(dst, 0xaac, {
-    0x00000040,
-  });
-
-  dst += write_cont(dst, 0xf00, {
-    0x00000000,
-  });
-
   return dst - start;
 }
 
-int build_update(uint8_t *dst, const CameraConfig &cc, const SensorInfo *s, std::vector<uint32_t> &patches) {
-  uint8_t *start = dst;
-
-  dst += write_random(dst, {
-    0x2c, 0xffffffff,
-    0x30, 0xffffffff,
-    0x34, 0xffffffff,
-    0x38, 0xffffffff,
-    0x3c, 0xffffffff,
-  });
-
-  dst += write_cont(dst, 0x560, {
-    0x00000001,
-    0x04440444,
-    0x04450445,
-    0x04440444,
-    0x04450445,
-    0x000000ca,
-    0x0000009c,
-  });
-
-  dst += write_cont(dst, 0x6fc, {
-    0x00800080,
-    0x00000080,
-    0x00000000,
-    0x00000000,
-  });
-
-  dst += write_cont(dst, 0xd84, {
-    0x000004b7,
-    0x00000787,
-  });
-
-  dst += write_cont(dst, 0xda4, {
-    0x000004b7,
-    0x00000787,
-  });
-
-  dst += write_cont(dst, 0xd6c, {
-    0x00000300,
-  });
-
-  dst += write_cont(dst, 0xd70, {
-    0x02640f00,
-    0x09016c7d,
-    0x01320f00,
-  });
-
-  dst += write_cont(dst, 0xd7c, {
-    0x00000f00,
-  });
-
-  dst += write_cont(dst, 0x40, {
-    0x00000c06,
-  });
-
-  dst += write_cont(dst, 0x48, {
-    (1 << 3) | (1 << 1),
-  });
-
-  dst += write_cont(dst, 0x4c, {
-    0x00000019,
-  });
-
-  dst += write_cont(dst, 0xe4c, {
-    0x00000000,
-  });
-
-  dst += write_cont(dst, 0xe6c, {
-    0x00000000,
-  });
-
-  dst += write_cont(dst, 0xe0c, {
-    0x00000e00,
-  });
-
-  dst += write_cont(dst, 0xe2c, {
-    0x00000e00,
-  });
-
-  dst += write_cont(dst, 0xd8c, {
-    0x00000000,
-  });
-
-  dst += write_cont(dst, 0xdac, {
-    0x00000000,
-  });
-
-  dst += write_cont(dst, 0xdcc, {
-    0x00000000,
-  });
-
-  dst += write_cont(dst, 0xdec, {
-    0x00000000,
-  });
 
-  dst += write_cont(dst, 0x44, {
-    0x00000000,
-  });
-
-  dst += write_cont(dst, 0xaac, {
-    0x00000040,
-  });
-
-  dst += write_cont(dst, 0xf00, {
-    0x00000000,
-  });
-
-  // *** extras, not in original dump ***
-
-  // black level scale + offset
-  dst += write_cont(dst, 0x6b0, {
-    (((uint32_t)(1 << s->bits_per_pixel) - 1) << 0xf) | (s->black_level << 0),
-    0x0,
-    0x0,
-  });
-
-  return dst - start;
-}

system/camerad/cameras/spectra.cc

@@ -498,10 +498,8 @@ void SpectraCamera::config_ife(int idx, int request_id, bool init) {
     if (!is_raw) {
       if (init) {
         buf_desc[0].length = build_initial_config((unsigned char*)ife_cmd.ptr + buf_desc[0].offset, sensor.get(), patches);
-      } else if (request_id == 1) {
-        buf_desc[0].length = build_first_update((unsigned char*)ife_cmd.ptr + buf_desc[0].offset);
       } else {
-        buf_desc[0].length = build_update((unsigned char*)ife_cmd.ptr + buf_desc[0].offset, cc, sensor.get(), patches);
+        buf_desc[0].length = build_update((unsigned char*)ife_cmd.ptr + buf_desc[0].offset, sensor.get(), patches);
       }
     }