From patchwork Thu Jul 29 06:48:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: You-Sheng Yang X-Patchwork-Id: 1511090 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Gb1Px4V40z9sCD; Thu, 29 Jul 2021 16:50:45 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1m8zsO-0007OX-2l; Thu, 29 Jul 2021 06:50:40 +0000 Received: from mail-pj1-f43.google.com ([209.85.216.43]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1m8zqe-0006yX-5f for kernel-team@lists.ubuntu.com; Thu, 29 Jul 2021 06:48:52 +0000 Received: by mail-pj1-f43.google.com with SMTP id l19so8975578pjz.0 for ; Wed, 28 Jul 2021 23:48:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=6YgJ2zAeFQyUnvOdtMPmCayaseOracSjPtpltM7jntg=; b=NjyxRdeB0r59sTrUUCo2syuVWX1d0QVadGn+D4jTTV/uB2DcuaPZVjfvZvxsySUdhq BS8Ob01FwTleq7np1q1J074+6LVqC06g2vxogi1R20yc7cKwcrgckiU87HJ5Z73KCvF/ L6Xvr284yVGa8X/1h1T91ZyqduD8MlOL7aG26Sx53//k1+ge90QaxjkhqoCWU5pnSuBm Bdds15qcVrf35IyRM2AB/O+d0tnqmPYM8pfeEDraW3azGMNXDSrWR1e+YWojkded7hn/ jzLvT7m8c722cgHZ9DxFZTji4PQkJv+YyW/YM3qpqKvRb9DYSosaLoTvHhf0GLmCZR1Y UK3w== X-Gm-Message-State: AOAM530pGnXF4Qa2i80aasVMMA8HERTzjDS6V75MFSJFS58lqcaXWmd7 WaoqmrMfuQ3mtceeON0qbK5xu24yPXwaJA== X-Google-Smtp-Source: ABdhPJzZn4OTCMKpk8x5NC9f4pdq5/11JTNvprMfjlZgKYXZYHblHWa1taz2v5F/Td+tvkDY6ep9fg== X-Received: by 2002:a17:90a:3048:: with SMTP id q8mr13484715pjl.120.1627541330040; Wed, 28 Jul 2021 23:48:50 -0700 (PDT) Received: from localhost (61-220-137-37.HINET-IP.hinet.net. [61.220.137.37]) by smtp.gmail.com with ESMTPSA id h19sm2143149pfo.161.2021.07.28.23.48.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Jul 2021 23:48:49 -0700 (PDT) From: You-Sheng Yang To: kernel-team@lists.ubuntu.com Subject: [PATCH 05/13][SRU][OEM-5.13] UBUNTU: SAUCE: IPU driver release WW04 Date: Thu, 29 Jul 2021 14:48:24 +0800 Message-Id: <20210729064832.25656-6-vicamo.yang@canonical.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210729064832.25656-1-vicamo.yang@canonical.com> References: <20210729064832.25656-1-vicamo.yang@canonical.com> MIME-Version: 1.0 Received-SPF: pass client-ip=209.85.216.43; envelope-from=vicamo@gmail.com; helo=mail-pj1-f43.google.com X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Wang Yating BugLink: https://bugs.launchpad.net/bugs/1921345 Signed-off-by: Wang Yating (backported from https://github.com/intel/ipu6-drivers/commit/626e9311e21f3f36f41f756f22f43d589d9de781 still build ipu3) Signed-off-by: You-Sheng Yang --- drivers/media/pci/intel/ipu-fw-isys.h | 2 ++ drivers/media/pci/intel/ipu6/Makefile | 2 +- drivers/media/pci/intel/ipu6/ipu-platform.h | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) 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;