diff --git a/general/package/goke-osdrv-gk7206v100/files/iq/SHA256SUMS b/general/package/goke-osdrv-gk7206v100/files/iq/SHA256SUMS new file mode 100644 index 000000000..de83e19b9 --- /dev/null +++ b/general/package/goke-osdrv-gk7206v100/files/iq/SHA256SUMS @@ -0,0 +1 @@ +c7e8149090da85a477b720027e67abe98d5c309f80c8c936cab554f7e05746d0 sc465sl.bin diff --git a/general/package/goke-osdrv-gk7206v100/files/iq/sc465sl.bin b/general/package/goke-osdrv-gk7206v100/files/iq/sc465sl.bin new file mode 100644 index 000000000..f38419383 Binary files /dev/null and b/general/package/goke-osdrv-gk7206v100/files/iq/sc465sl.bin differ diff --git a/general/package/goke-osdrv-gk7206v100/files/sensor/config/sc465sl_i2c_4M.ini b/general/package/goke-osdrv-gk7206v100/files/sensor/config/sc465sl_i2c_4M.ini index ae24e3340..57f97e0ad 100644 --- a/general/package/goke-osdrv-gk7206v100/files/sensor/config/sc465sl_i2c_4M.ini +++ b/general/package/goke-osdrv-gk7206v100/files/sensor/config/sc465sl_i2c_4M.ini @@ -75,4 +75,4 @@ enable=FALSE ;AI noise reduction on the NPU; the SDK runs it at 10 fps, op_type=MANUAL ;MANUAL: pos_gain/gau_gain below; AUTO: per-ISO table pos_gain=64 gau_gain=64 -model=/usr/lib/sensors/sc465sl_ainr_2560x1440.xmm +model=/usr/share/aiisp/sc465sl/ainr_2560x1440.xmm diff --git a/general/package/goke-osdrv-gk7206v100/goke-osdrv-gk7206v100.mk b/general/package/goke-osdrv-gk7206v100/goke-osdrv-gk7206v100.mk index b1926c163..58f35dfa2 100644 --- a/general/package/goke-osdrv-gk7206v100/goke-osdrv-gk7206v100.mk +++ b/general/package/goke-osdrv-gk7206v100/goke-osdrv-gk7206v100.mk @@ -75,6 +75,28 @@ define GOKE_OSDRV_GK7206V100_INSTALL_TARGET_CMDS $(INSTALL) -m 755 -d $(TARGET_DIR)/etc/sensors $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensors $(GOKE_OSDRV_GK7206V100_PKGDIR)/files/sensor/config/*.ini + + # Image tuning, as the SDK's PQ bins: the ISP, AE and AWB parameter + # blocks xmedia_isp_import() loads. The streamer reads + # /etc/sensors/iq/.bin (isp.iqProfile overrides the path). + # + # sc465sl.bin carries the tuning the vendor's own firmware applies to an + # SC465SL on GK7206V11 (Xiongmai IPC_GK7206V11_K8, V1.10.T02.20261103): + # its per-ISO noise reduction, sharpening, demosaic, defect-pixel, + # gamma, DRC, dehaze, LCE and colour tables, its AWB calibration and its + # AE compensation curve, over the SDK's defaults. The SDK publishes no + # tuning for this sensor; without it every block runs on the ISP + # library's generic defaults. The ISP blocks were read from the vendor + # firmware running in a QEMU twin; interpolated to a stock camera's ISO, + # its noise-reduction and sharpening tables give the values that camera + # reports live. Checked side by side with a stock camera in low light + # (ISO ~20000). Regenerated by OpenIPC/qemu-bench tools/xm-isp-tuning + # from the stock dump; not by this build. Interim: it is to be replaced + # by a text profile built here, once more boards in the lab can check + # one against the vendor's picture. + cd $(GOKE_OSDRV_GK7206V100_PKGDIR)/files/iq && sha256sum -c --quiet SHA256SUMS + $(INSTALL) -m 755 -d $(TARGET_DIR)/etc/sensors/iq + $(INSTALL) -m 644 -t $(TARGET_DIR)/etc/sensors/iq $(GOKE_OSDRV_GK7206V100_PKGDIR)/files/iq/*.bin endef $(eval $(generic-package)) diff --git a/general/package/hisilicon-opensdk/hisilicon-opensdk.mk b/general/package/hisilicon-opensdk/hisilicon-opensdk.mk index f97b2a191..15d4c3219 100644 --- a/general/package/hisilicon-opensdk/hisilicon-opensdk.mk +++ b/general/package/hisilicon-opensdk/hisilicon-opensdk.mk @@ -5,7 +5,7 @@ ################################################################################ HISILICON_OPENSDK_SITE = $(call github,openipc,openhisilicon,$(HISILICON_OPENSDK_VERSION)) -HISILICON_OPENSDK_VERSION = 5a18160707292296866e5b047fb2d03f9f2ee9a5 +HISILICON_OPENSDK_VERSION = 560559da3e58814d841f0624cd421990bd0b69bb HISILICON_OPENSDK_LICENSE = GPL-3.0 HISILICON_OPENSDK_LICENSE_FILES = LICENSE @@ -317,6 +317,14 @@ HISILICON_OPENSDK_SENSORS_gk7206v100 = \ smartsens_sc500ai/libsns_sc500ai HISILICON_OPENSDK_SENSORS = $(HISILICON_OPENSDK_SENSORS_$(OPENIPC_SOC_FAMILY)) +# gk7206v100's AI noise reduction networks, which the ISP runs on the NPU: +# the SDK's own, kept beside each sensor driver as ainr_x.xmm and +# installed as /usr/share/aiisp//ainr_x.xmm (about 190 KB each +# in the squashfs). Only the sensors measured on a camera; add one here once +# it has been. +HISILICON_OPENSDK_AINR_gk7206v100 = \ + smartsens_sc465sl:sc465sl:ainr_2560x1440 + # SC2315E on hi3516ev200 builds from openhisilicon's smart_sc2315e, the source # of the libsns_sc2315e.so hisilicon-osdrv-hi3516ev200 used to carry as a # binary. That binary wrote two words past its sensor state on every @@ -696,6 +704,10 @@ define HISILICON_OPENSDK_INSTALL_TARGET_CMDS $(foreach s,$(HISILICON_OPENSDK_SENSORS), \ $(INSTALL) -D -m 0644 $(@D)/libraries/sensor/gk7206v100/$(s).so $(TARGET_DIR)/usr/lib/sensors ; \ ) + $(foreach a,$(HISILICON_OPENSDK_AINR_gk7206v100), \ + $(INSTALL) -D -m 0644 $(@D)/libraries/sensor/gk7206v100/$(word 1,$(subst :, ,$(a)))/$(word 3,$(subst :, ,$(a))).xmm \ + $(TARGET_DIR)/usr/share/aiisp/$(word 2,$(subst :, ,$(a)))/$(word 3,$(subst :, ,$(a))).xmm ; \ + ) $(INSTALL) -m 755 -d $(HISILICON_OPENSDK_KMOD_DST) for ko in $(@D)/kernel/open_*.ko; do \ [ -f $${ko} ] || continue; \