From: Wang Yating Date: Thu, 29 Jul 2021 06:48:24 +0000 (+0800) Subject: UBUNTU: SAUCE: IPU driver release WW04 X-Git-Tag: Ubuntu-5.15.0-36.37~64 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=9a5c4cef0be18ce1cda9a06d7d510da54bb90f55;p=mirror_ubuntu-jammy-kernel.git UBUNTU: SAUCE: IPU driver release WW04 BugLink: https://bugs.launchpad.net/bugs/1955383 Signed-off-by: Wang Yating (backported from commit 626e9311e21f3f36f41f756f22f43d589d9de781 github.com/intel/ipu6-drivers still build ipu3) Signed-off-by: You-Sheng Yang Acked-by: Andrea Righi Acked-by: Kleber Sacilotto de Souza Signed-off-by: Kleber Sacilotto de Souza --- diff --git a/drivers/media/pci/intel/ipu-fw-isys.h b/drivers/media/pci/intel/ipu-fw-isys.h index ad599c401b50..4d1140c0dc32 100644 --- a/drivers/media/pci/intel/ipu-fw-isys.h +++ b/drivers/media/pci/intel/ipu-fw-isys.h @@ -12,10 +12,12 @@ #define IPU_MAX_OPINS ((IPU_MAX_IPINS) + 1) #define IPU6_STREAM_ID_MAX 16 +#define IPU6_NONSECURE_STREAM_ID_MAX 12 #define IPU6_DEV_SEND_QUEUE_SIZE (IPU6_STREAM_ID_MAX) #define IPU6_NOF_SRAM_BLOCKS_MAX (IPU6_STREAM_ID_MAX) #define IPU6_N_MAX_MSG_SEND_QUEUES (IPU6_STREAM_ID_MAX) #define IPU6SE_STREAM_ID_MAX 8 +#define IPU6SE_NONSECURE_STREAM_ID_MAX 4 #define IPU6SE_DEV_SEND_QUEUE_SIZE (IPU6SE_STREAM_ID_MAX) #define IPU6SE_NOF_SRAM_BLOCKS_MAX (IPU6SE_STREAM_ID_MAX) #define IPU6SE_N_MAX_MSG_SEND_QUEUES (IPU6SE_STREAM_ID_MAX) diff --git a/drivers/media/pci/intel/ipu6/Makefile b/drivers/media/pci/intel/ipu6/Makefile index f2aeade54082..2bb2db666f7e 100644 --- a/drivers/media/pci/intel/ipu6/Makefile +++ b/drivers/media/pci/intel/ipu6/Makefile @@ -5,7 +5,7 @@ ifneq ($(EXTERNAL_BUILD), 1) srcpath := $(srctree) endif -ccflags-y += -DHAS_DUAL_CMD_CTX_SUPPORT=0 -DIPU_TPG_FRAME_SYNC -DIPU_PSYS_GPC \ +ccflags-y += -DHAS_DUAL_CMD_CTX_SUPPORT=1 -DIPU_TPG_FRAME_SYNC -DIPU_PSYS_GPC \ -DIPU_ISYS_GPC intel-ipu6-objs += ../ipu.o \ diff --git a/drivers/media/pci/intel/ipu6/ipu-platform.h b/drivers/media/pci/intel/ipu6/ipu-platform.h index e98b9672b74b..62df421fa4d7 100644 --- a/drivers/media/pci/intel/ipu6/ipu-platform.h +++ b/drivers/media/pci/intel/ipu6/ipu-platform.h @@ -16,8 +16,8 @@ */ #define IPU_MEDIA_DEV_MODEL_NAME "ipu6" -#define IPU6SE_ISYS_NUM_STREAMS 8 /* Max 8 */ -#define IPU6_ISYS_NUM_STREAMS 16 /* Max 16 */ +#define IPU6SE_ISYS_NUM_STREAMS IPU6SE_NONSECURE_STREAM_ID_MAX +#define IPU6_ISYS_NUM_STREAMS IPU6_NONSECURE_STREAM_ID_MAX /* declearations, definitions in ipu6.c */ extern struct ipu_isys_internal_pdata isys_ipdata;