WW41 release

Signed-off-by: jiabinhe <[email protected]>

drivers/media/pci/intel/ipu.c

@@ -367,8 +367,9 @@ static int ipu_pci_config_setup(struct pci_dev *dev)
 	pci_write_config_word(dev, PCI_COMMAND, pci_command);
 
 	/* disable IPU6 PCI ATS on mtl ES2 */
-	if (ipu_ver == IPU_VER_6EP_MTL && boot_cpu_data.x86_stepping == 0x2 &&
-	    pci_ats_supported(dev))
+	if ((boot_cpu_data.x86_model == 0xac ||
+	     boot_cpu_data.x86_model == 0xaa) &&
+	    boot_cpu_data.x86_stepping == 0x2 && pci_ats_supported(dev))
 		pci_disable_ats(dev);
 
 	/* no msi pci capability for IPU6EP */

drivers/media/pci/intel/ipu6/Makefile

@@ -37,9 +37,9 @@ intel-ipu6-isys-objs			+= ../ipu-isys-csi2-be.o
 
 obj-$(CONFIG_VIDEO_INTEL_IPU6)		+= intel-ipu6-isys.o
 
-obj-$(CONFIG_VIDEO_INTEL_IPU6)		+= ../psys/
+obj-$(CONFIG_VIDEO_INTEL_IPU6)		+= psys/
 
 ccflags-y += -I$(srcpath)/$(src)/../../../../../include/
-ccflags-y += -I$(srcpath)/$(src)/../psys/
+ccflags-y += -I$(srcpath)/$(src)/psys/
 ccflags-y += -I$(srcpath)/$(src)/../
 ccflags-y += -I$(srcpath)/$(src)/

drivers/media/pci/intel/ipu6/psys/Makefile

@@ -0,0 +1,36 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
+is_kernel_lt_6_10 = $(shell if [ $$(printf "6.10\n$(KERNELVERSION)" | sort -V | head -n1) != "6.10" ]; then echo 1; fi)
+ifeq ($(is_kernel_lt_6_10), 1)
+ifneq ($(EXTERNAL_BUILD), 1)
+src := $(srctree)/$(src)
+endif
+endif
+
+ccflags-y += -DIPU_OTF_SUPPORT
+ccflags-y += -DIPU_PSYS_GPC
+
+intel-ipu6-psys-objs			+= ipu-psys.o \
+					   ipu6-psys.o \
+					   ipu-resources.o \
+					   ipu6-psys-gpc.o \
+					   ipu6-l-scheduler.o \
+					   ipu6-ppg.o
+
+intel-ipu6-psys-objs			+= ipu-fw-resources.o \
+					   ipu6-fw-resources.o \
+					   ipu6se-fw-resources.o \
+					   ipu6ep-fw-resources.o \
+					   ipu-fw-psys.o
+
+ifeq ($(CONFIG_COMPAT),y)
+intel-ipu6-psys-objs			+= ipu-psys-compat32.o
+endif
+
+obj-$(CONFIG_VIDEO_INTEL_IPU6)		+= intel-ipu6-psys.o
+
+ifeq ($(is_kernel_lt_6_10), 1)
+ccflags-y += -I$(src)/../ipu6/
+endif
+ccflags-y += -I$(src)/../
+ccflags-y += -I$(src)/../../