ARL platform PV release on 2024-09-27

Signed-off-by: Hao Yao <[email protected]>

.github/workflows/test.yml

@@ -112,8 +112,8 @@ jobs:
                                   # Add unstable kernel ppa
                                   add-apt-repository ppa:canonical-kernel-team/unstable
                                   apt-get update --quiet;
-                                  # latest and wip generic kernel headers
-                                  apt-get install --yes linux-headers-generic linux-headers-generic-wip
+                                  # latest generic kernel headers
+                                  apt-get install --yes linux-headers-generic
                                   # latest oem kernel
                                   apt-get install --yes linux-headers-oem-22.04
 

Makefile

@@ -24,6 +24,7 @@ KV_IVSC := 6.6.0
 KV_IPU_BRIDGE := 6.6.0
 KV_OV2740 := 6.8.0
 KV_OV05C10 := 6.8.0
+KV_IPU6_ISYS := 6.10.0
 
 KERNEL_SRC ?= /lib/modules/$(KERNELRELEASE)/build
 MODSRC := $(shell pwd)
@@ -74,7 +75,11 @@ export CONFIG_IPU_ISYS_BRIDGE = y
 export CONFIG_IPU_BRIDGE = n
 endif
 export EXTERNAL_BUILD = 1
-obj-y += drivers/media/pci/intel/
+ifeq ($(call version_lt,$(KERNEL_VERSION),$(KV_IPU6_ISYS)),true)
+obj-y += drivers/media/pci/intel/ipu6/
+else
+obj-y += drivers/media/pci/intel/ipu6/psys/
+endif
 
 export CONFIG_VIDEO_HM11B1 = m
 export CONFIG_VIDEO_OV01A1S = m

dkms.conf

@@ -4,6 +4,7 @@ PACKAGE_VERSION=0.0.0
 MAKE="make KERNELRELEASE=$kernelver KERNEL_SRC=$kernel_source_dir"
 CLEAN="make KERNELRELEASE=$kernelver KERNEL_SRC=$kernel_source_dir clean"
 AUTOINSTALL="yes"
+BUILD_EXCLUSIVE_CONFIG="CONFIG_VIDEO_V4L2_I2C"
 
 version_lt() {
   IFS='.' read -r i j k <<< "$1"
@@ -33,62 +34,64 @@ KERNEL_VERSION=$(echo ${kernelver} | sed 's/[^0-9.]*\([0-9.]*\).*/\1/')
 KV_IVSC=6.6.0
 KV_OV2740=6.8.0
 KV_OV05C10=6.8.0
+KV_IPU6_ISYS=6.10.0
 
-BUILT_MODULE_NAME[0]="intel-ipu6"
-BUILT_MODULE_LOCATION[0]="drivers/media/pci/intel/ipu6"
+BUILT_MODULE_NAME[0]="hm11b1"
+BUILT_MODULE_LOCATION[0]="drivers/media/i2c"
 DEST_MODULE_LOCATION[0]="/updates"
 
-BUILT_MODULE_NAME[1]="intel-ipu6-isys"
-BUILT_MODULE_LOCATION[1]="drivers/media/pci/intel/ipu6"
+BUILT_MODULE_NAME[1]="ov01a1s"
+BUILT_MODULE_LOCATION[1]="drivers/media/i2c"
 DEST_MODULE_LOCATION[1]="/updates"
 
-BUILT_MODULE_NAME[2]="intel-ipu6-psys"
-BUILT_MODULE_LOCATION[2]="drivers/media/pci/intel/ipu6"
+BUILT_MODULE_NAME[2]="ov01a10"
+BUILT_MODULE_LOCATION[2]="drivers/media/i2c"
 DEST_MODULE_LOCATION[2]="/updates"
 
-BUILT_MODULE_NAME[3]="hm11b1"
+BUILT_MODULE_NAME[3]="ov02c10"
 BUILT_MODULE_LOCATION[3]="drivers/media/i2c"
 DEST_MODULE_LOCATION[3]="/updates"
 
-BUILT_MODULE_NAME[4]="ov01a1s"
+BUILT_MODULE_NAME[4]="ov02e10"
 BUILT_MODULE_LOCATION[4]="drivers/media/i2c"
 DEST_MODULE_LOCATION[4]="/updates"
 
-BUILT_MODULE_NAME[5]="ov01a10"
+BUILT_MODULE_NAME[5]="hm2170"
 BUILT_MODULE_LOCATION[5]="drivers/media/i2c"
 DEST_MODULE_LOCATION[5]="/updates"
 
-BUILT_MODULE_NAME[6]="ov02c10"
+BUILT_MODULE_NAME[6]="hm2172"
 BUILT_MODULE_LOCATION[6]="drivers/media/i2c"
 DEST_MODULE_LOCATION[6]="/updates"
 
-BUILT_MODULE_NAME[7]="ov02e10"
+BUILT_MODULE_NAME[7]="hi556"
 BUILT_MODULE_LOCATION[7]="drivers/media/i2c"
 DEST_MODULE_LOCATION[7]="/updates"
 
-BUILT_MODULE_NAME[8]="hm2170"
-BUILT_MODULE_LOCATION[8]="drivers/media/i2c"
-DEST_MODULE_LOCATION[8]="/updates"
+if ! version_lt ${KERNEL_VERSION} ${KV_OV05C10}; then
+    BUILT_MODULE_NAME[8]="ov05c10"
+    BUILT_MODULE_LOCATION[8]="drivers/media/i2c"
+    DEST_MODULE_LOCATION[8]="/updates"
+fi
+
+if version_lt ${KERNEL_VERSION} ${KV_OV2740}; then
+    BUILT_MODULE_NAME[8]="ov2740"
+    BUILT_MODULE_LOCATION[8]="drivers/media/i2c"
+    DEST_MODULE_LOCATION[8]="/updates"
+fi
 
-BUILT_MODULE_NAME[9]="hm2172"
-BUILT_MODULE_LOCATION[9]="drivers/media/i2c"
+if version_lt ${KERNEL_VERSION} ${KV_IPU6_ISYS}; then
+BUILT_MODULE_NAME[9]="intel-ipu6"
+BUILT_MODULE_LOCATION[9]="drivers/media/pci/intel/ipu6"
 DEST_MODULE_LOCATION[9]="/updates"
 
-BUILT_MODULE_NAME[10]="hi556"
-BUILT_MODULE_LOCATION[10]="drivers/media/i2c"
+BUILT_MODULE_NAME[10]="intel-ipu6-isys"
+BUILT_MODULE_LOCATION[10]="drivers/media/pci/intel/ipu6"
 DEST_MODULE_LOCATION[10]="/updates"
 
-
-if ! version_lt ${KERNEL_VERSION} ${KV_OV05C10}; then
-    BUILT_MODULE_NAME[11]="ov05c10"
-    BUILT_MODULE_LOCATION[11]="drivers/media/i2c"
-    DEST_MODULE_LOCATION[11]="/updates"
-fi
-
-if version_lt ${KERNEL_VERSION} ${KV_OV2740}; then
-    BUILT_MODULE_NAME[11]="ov2740"
-    BUILT_MODULE_LOCATION[11]="drivers/media/i2c"
-    DEST_MODULE_LOCATION[11]="/updates"
+BUILT_MODULE_NAME[11]="intel-ipu6-psys"
+BUILT_MODULE_LOCATION[11]="drivers/media/pci/intel/ipu6/psys"
+DEST_MODULE_LOCATION[11]="/updates"
 fi
 
 if version_lt ${KERNEL_VERSION} ${KV_IVSC}; then