Received: by 2002:a05:6a10:413:0:0:0:0 with SMTP id 19csp2939416pxp; Mon, 14 Mar 2022 07:47:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyxX1c13djWiR9CVADSggHt0fD070wJ8NHe2gHLg/HrP3ctocIKD/7nMx1/nfI94x/GO1Qe X-Received: by 2002:a63:5d4d:0:b0:381:ac6:421b with SMTP id o13-20020a635d4d000000b003810ac6421bmr14678607pgm.238.1647269269689; Mon, 14 Mar 2022 07:47:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647269269; cv=none; d=google.com; s=arc-20160816; b=B8Liu7b5gZG7G2nC7rPnCALDJeXOF5jQoQ3FkRapol9ucAHZFWV3BuYfqtpmzVKAan rWU+s5w6e0uKT7EowCUTVggkic7UgUR0Mu8e+BjESJ40FvAkhhxb6wVJZZARP9wlM4mn 28+b5oNxVBOyXsMkrQWEfcpAC6W9SMZjijLTN0HpRBUIYIpTuihQ3Mknr5jHi6Ng+ubc d80ZpzDCCTpgZAcWPiIylMnjTjGwn+e102W4xXaPsz9UEkbVZND0LiYpZib/cTOvmzRy +dumzseskS/WGaOwNHa87+mTLHogLiEgzhJVbRwRubjHmQjBgdL91CLVgEFw23PBMGM6 OM7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:to:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:from :dkim-signature; bh=IaIAEzYmPzWT7CgrY3th7+BZjCMsGe5rioPNA9hYcfw=; b=K8jYKcwv3dI9W4FxCj7YVtxbETuIBOoBT+i5EpQU7LlXiu9fwZZMg3tmZEpCMWT+39 /VusidY87XOseQ1J+rxNfU0ert7Bhz9TPnu6dpO2vKsiQS1EF3dA+8I9wpWvXgZlwzbu IdXk8JKcXYikO91h6gfRdSYwACevs3x6L8jxaXqKTfZg6SPm+NKK+TrIi2QDqv+xkMPg HSfZ5sFNhZXWrrij7UXOd7oEEDjTQOCYEY6qrQDzzkCPA2sePX8a9AGKhsPEZ0JhuwR9 Kcu31QLQu1TT3RyeICoW1wRJ/m8TeE8AXc9YZm2+f254k4Yfvg33KAzcoBYunzToCl7V JQBA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@kernel.org header.s=k20201202 header.b=auboGjWZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b2-20020a63cf42000000b0037402a10428si14685569pgj.32.2022.03.14.07.47.36; Mon, 14 Mar 2022 07:47:49 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=fail header.i=@kernel.org header.s=k20201202 header.b=auboGjWZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236888AbiCNH6g (ORCPT + 99 others); Mon, 14 Mar 2022 03:58:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41866 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236905AbiCNH5f (ORCPT ); Mon, 14 Mar 2022 03:57:35 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5058C41318; Mon, 14 Mar 2022 00:56:10 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id DDC5561199; Mon, 14 Mar 2022 07:56:02 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 53352C34115; Mon, 14 Mar 2022 07:56:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1647244561; bh=ZWBNMKhjWkFrdhIyIsVE25iCEQUAlTjwV2xwf63/5sQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=auboGjWZOT59mgQ4g54A3kr4Gam0eivc6wNs2f3HNq6/+pQKl/r2WmawxH3vXhbcq bU2SvIatKBwyGTnccM8OmDicwiFMd9SiQmXXsyYH91p1QZEwOrHeN59XOqziDWU1hC 4p54qgx9/rN9h3qO1LaQx3u8ruPjuFy4ey4JxDhn1yGJ3bzkovQ8MhA2iBryo3EFk8 /JqO7X7Bt0iYvVj+AlKwE7vRWwAR0GYHhXUXSSLuzyOhtaZttysj4uodHd8DpACVJx 9vGOG2NqcqYVIEhWWHZgMg5ffNKwADL4rTcxu52/5hqxqW3IHioKNMDY6DObddT40v XUqPXZWlwWVcA== Received: from mchehab by mail.kernel.org with local (Exim 4.94.2) (envelope-from ) id 1nTfYd-001kVL-32; Mon, 14 Mar 2022 08:55:59 +0100 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Dmitry Osipenko , Hans Verkuil , Jernej Skrabec , Laurent Pinchart , Matthias Brugger , Ming Qian , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-mediatek@lists.infradead.org Subject: [PATCH 18/64] media: platform: mtk-vcodec: move config to its own file Date: Mon, 14 Mar 2022 08:55:10 +0100 Message-Id: <3dcaf6f8db4139011a30696fb73b342fa0b014c3.1647242579.git.mchehab@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-8.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In order to better organize the platform/Kconfig, place mtk-vcodec-specific config stuff on a separate Kconfig file. Signed-off-by: Mauro Carvalho Chehab --- To avoid mailbombing on a large number of people, only mailing lists were C/C on the cover. See [PATCH 00/64] at: https://lore.kernel.org/all/cover.1647242578.git.mchehab@kernel.org/ drivers/media/platform/Kconfig | 37 +---------------------- drivers/media/platform/mtk-vcodec/Kconfig | 36 ++++++++++++++++++++++ 2 files changed, 37 insertions(+), 36 deletions(-) create mode 100644 drivers/media/platform/mtk-vcodec/Kconfig diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index 3b3d7af47ca1..ab7c85613625 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -50,6 +50,7 @@ source "drivers/media/platform/exynos-gsc/Kconfig" source "drivers/media/platform/meson/ge2d/Kconfig" source "drivers/media/platform/mtk-jpeg/Kconfig" source "drivers/media/platform/mtk-mdp/Kconfig" +source "drivers/media/platform/mtk-vcodec/Kconfig" source "drivers/media/platform/omap/Kconfig" source "drivers/media/platform/aspeed/Kconfig" @@ -197,42 +198,6 @@ config VIDEO_MEDIATEK_VPU To compile this driver as a module, choose M here: the module will be called mtk-vpu. -config VIDEO_MEDIATEK_VCODEC - tristate "Mediatek Video Codec driver" - depends on V4L_MEM2MEM_DRIVERS - depends on MTK_IOMMU || COMPILE_TEST - depends on VIDEO_DEV && VIDEO_V4L2 - depends on ARCH_MEDIATEK || COMPILE_TEST - depends on VIDEO_MEDIATEK_VPU || MTK_SCP - # The two following lines ensure we have the same state ("m" or "y") as - # our dependencies, to avoid missing symbols during link. - depends on VIDEO_MEDIATEK_VPU || !VIDEO_MEDIATEK_VPU - depends on MTK_SCP || !MTK_SCP - depends on MTK_SMI || (COMPILE_TEST && MTK_SMI=n) - select VIDEOBUF2_DMA_CONTIG - select V4L2_MEM2MEM_DEV - select VIDEO_MEDIATEK_VCODEC_VPU if VIDEO_MEDIATEK_VPU - select VIDEO_MEDIATEK_VCODEC_SCP if MTK_SCP - select V4L2_H264 - select MEDIA_CONTROLLER - select MEDIA_CONTROLLER_REQUEST_API - help - Mediatek video codec driver provides HW capability to - encode and decode in a range of video formats on MT8173 - and MT8183. - - Note that support for MT8173 requires VIDEO_MEDIATEK_VPU to - also be selected. Support for MT8183 depends on MTK_SCP. - - To compile this driver as modules, choose M here: the - modules will be called mtk-vcodec-dec and mtk-vcodec-enc. - -config VIDEO_MEDIATEK_VCODEC_VPU - bool - -config VIDEO_MEDIATEK_VCODEC_SCP - bool - config VIDEO_MEM2MEM_DEINTERLACE tristate "Deinterlace support" depends on V4L_MEM2MEM_DRIVERS diff --git a/drivers/media/platform/mtk-vcodec/Kconfig b/drivers/media/platform/mtk-vcodec/Kconfig new file mode 100644 index 000000000000..635801a19d55 --- /dev/null +++ b/drivers/media/platform/mtk-vcodec/Kconfig @@ -0,0 +1,36 @@ +# SPDX-License-Identifier: GPL-2.0-only +config VIDEO_MEDIATEK_VCODEC_SCP + bool + +config VIDEO_MEDIATEK_VCODEC_VPU + bool + +config VIDEO_MEDIATEK_VCODEC + tristate "Mediatek Video Codec driver" + depends on V4L_MEM2MEM_DRIVERS + depends on MTK_IOMMU || COMPILE_TEST + depends on VIDEO_DEV && VIDEO_V4L2 + depends on ARCH_MEDIATEK || COMPILE_TEST + depends on VIDEO_MEDIATEK_VPU || MTK_SCP + # The two following lines ensure we have the same state ("m" or "y") as + # our dependencies, to avoid missing symbols during link. + depends on VIDEO_MEDIATEK_VPU || !VIDEO_MEDIATEK_VPU + depends on MTK_SCP || !MTK_SCP + depends on MTK_SMI || (COMPILE_TEST && MTK_SMI=n) + select VIDEOBUF2_DMA_CONTIG + select V4L2_MEM2MEM_DEV + select VIDEO_MEDIATEK_VCODEC_VPU if VIDEO_MEDIATEK_VPU + select VIDEO_MEDIATEK_VCODEC_SCP if MTK_SCP + select V4L2_H264 + select MEDIA_CONTROLLER + select MEDIA_CONTROLLER_REQUEST_API + help + Mediatek video codec driver provides HW capability to + encode and decode in a range of video formats on MT8173 + and MT8183. + + Note that support for MT8173 requires VIDEO_MEDIATEK_VPU to + also be selected. Support for MT8183 depends on MTK_SCP. + + To compile this driver as modules, choose M here: the + modules will be called mtk-vcodec-dec and mtk-vcodec-enc. -- 2.35.1