From patchwork Wed Apr 14 07:54:08 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: 1466043 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 4FKvt55145z9sWd; Wed, 14 Apr 2021 17:55:57 +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 1lWaNN-0007Hq-Rc; Wed, 14 Apr 2021 07:55:53 +0000 Received: from mail-pj1-f45.google.com ([209.85.216.45]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1lWaM5-00076h-6o for kernel-team@lists.ubuntu.com; Wed, 14 Apr 2021 07:54:33 +0000 Received: by mail-pj1-f45.google.com with SMTP id nm3-20020a17090b19c3b029014e1bbf6c60so6199514pjb.4 for ; Wed, 14 Apr 2021 00:54:32 -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=CjrHugdr4+qIHjC4zo3ZiGTIy2XYt7weTZqf84eUT6Y=; b=kq+b7b9oRAU+U8VEDk2kby2B0Pt9OoracJqzYOJSpkUV7tAhpLdbkMQm/BZSzpnvgx V9Lay/aT1lFQAB8Juopu04vG9Ul1xNI8DRY+C806IP8lEXOnazQ3qgNLLY7hJqUWQLdV rHwCE7rGjGK1lkM5eyflUIy6IKmJZcLnwZhlZo7YXqQ6dtjHWKl4MFigt4jseOo2KZVG oGGQCpUtCbWEj1mZz/qZuv8hr5dPDkQOn2b2YR2JcWWqvpUT+fWtvw3s3p7wLrrZkLyQ 1j6sEEb7GHF7vUA2r8q+D71KDGt4RV4wqMWUUe3EY9jx+px758F3V7iJ9Iyi2aFmRa+K v3OQ== X-Gm-Message-State: AOAM531F5dhKPt+Ro3RydiT+1NZhau22tRPg8UZs0sXFoM4Xg2zKWEhN gyTbbKrORDSXwpCi339BOvroMFe4KoxgoA== X-Google-Smtp-Source: ABdhPJygs8zyu7WvQ2uPvUfdQYX9A+AfAj7/Ou3jFVndwzhznHUBSOh9y3rXFqytJ9aPyiEVDE2BAg== X-Received: by 2002:a17:90b:1bce:: with SMTP id oa14mr2205875pjb.9.1618386871076; Wed, 14 Apr 2021 00:54:31 -0700 (PDT) Received: from localhost (61-220-137-37.HINET-IP.hinet.net. [61.220.137.37]) by smtp.gmail.com with ESMTPSA id i14sm15988997pgl.79.2021.04.14.00.54.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Apr 2021 00:54:30 -0700 (PDT) From: You-Sheng Yang To: kernel-team@lists.ubuntu.com Subject: [PATCH v3 5/9][SRU][OEM-5.10] UBUNTU: SAUCE: IPU driver release WW04 Date: Wed, 14 Apr 2021 15:54:08 +0800 Message-Id: <20210414075412.2288687-6-vicamo.yang@canonical.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210414075412.2288687-1-vicamo.yang@canonical.com> References: <20210414075412.2288687-1-vicamo.yang@canonical.com> MIME-Version: 1.0 Received-SPF: pass client-ip=209.85.216.45; envelope-from=vicamo@gmail.com; helo=mail-pj1-f45.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;