Revert "UBUNTU: SAUCE: IPU driver release WW04"

BugLink: https://bugs.launchpad.net/bugs/1955383
This reverts commit 5aa58b742fa7d3a23b7b36e6ff460edf84fc0582.

Signed-off-by: Stefan Bader <stefan.bader@canonical.com>

diff --git a/drivers/media/pci/intel/ipu-fw-isys.h b/drivers/media/pci/intel/ipu-fw-isys.h
index 4d1140c0dc323048ec6183f491e38705c7b740e0..ad599c401b50c814194dc1172947371ebab30eea 100644 (file)
--- a/drivers/media/pci/intel/ipu-fw-isys.h
+++ b/drivers/media/pci/intel/ipu-fw-isys.h
@@ -12,12 +12,10 @@
 #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 2bb2db666f7e0ecfc4def0f0e450658fdb850304..f2aeade540827582507e928a551aa607852be1cd 100644 (file)
--- 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=1 -DIPU_TPG_FRAME_SYNC -DIPU_PSYS_GPC \
+ccflags-y += -DHAS_DUAL_CMD_CTX_SUPPORT=0 -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 62df421fa4d765568543d15a2b0564ceb370e662..e98b9672b74b6d177c179133a2dcea66efefae2f 100644 (file)
--- 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          IPU6SE_NONSECURE_STREAM_ID_MAX
-#define IPU6_ISYS_NUM_STREAMS            IPU6_NONSECURE_STREAM_ID_MAX
+#define IPU6SE_ISYS_NUM_STREAMS          8       /* Max 8 */
+#define IPU6_ISYS_NUM_STREAMS            16      /* Max 16 */
 
 /* declearations, definitions in ipu6.c */
 extern struct ipu_isys_internal_pdata isys_ipdata;