From patchwork Fri Jun 21 10:50:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Stein X-Patchwork-Id: 102666 X-Patchwork-Delegate: sebastian.fricke@collabora.com Received: from am.mirrors.kernel.org ([147.75.80.249]) by linuxtv.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1sKbr5-0000JG-09 for patchwork@linuxtv.org; Fri, 21 Jun 2024 10:50:57 +0000 Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 9B1A81F227DE for ; Fri, 21 Jun 2024 10:50:52 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 456F1172BBF; Fri, 21 Jun 2024 10:50:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=tq-group.com header.i=@tq-group.com header.b="U63KeK/J"; dkim=fail reason="key not found in DNS" (0-bit key) header.d=ew.tq-group.com header.i=@ew.tq-group.com header.b="so2t6f3G" X-Original-To: linux-media@vger.kernel.org Received: from mx1.tq-group.com (mx1.tq-group.com [93.104.207.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CC3643207; Fri, 21 Jun 2024 10:50:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=93.104.207.81 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718967036; cv=none; b=WHrfh3qEzM5K8c1fLaEmxeLK5U+ApCcBsNv+w9vob7yO8RyWt4joFZBDkCy2aJra7zDTox3UWcSzAUlzDkvUT4Hlqn8wCjpbrccM3eTZqqsY6Pweapk0UpoUyVUcZVwijORZNub8w4xZv6qRy70GEuFBMMTfy/HYhAoPTnQPIWE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718967036; c=relaxed/simple; bh=XsAQh3brdURY8xZEx3wFV/gKsLsVModgCVdpUgEpC6s=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=ZvIDJWOQOrXp3LdSeCYd2lJdWwsK7OfCRp/IqjsyXcAsdlv2CD7EaHAeARUOP0lNa8GXrgiJkUCsHKnh5SmtFb3T8lsDDWhegm1pxWkvcwwzgFPmj9IBy7WT3CZqa6r3pyBHIgd6eQaBiJWfPI0e5QVsGD1livAJDj/4equgqK0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=ew.tq-group.com; spf=pass smtp.mailfrom=ew.tq-group.com; dkim=pass (2048-bit key) header.d=tq-group.com header.i=@tq-group.com header.b=U63KeK/J; dkim=fail (0-bit key) header.d=ew.tq-group.com header.i=@ew.tq-group.com header.b=so2t6f3G reason="key not found in DNS"; arc=none smtp.client-ip=93.104.207.81 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=ew.tq-group.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ew.tq-group.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tq-group.com; i=@tq-group.com; q=dns/txt; s=key1; t=1718967033; x=1750503033; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=SujQfNUHiwMLd2TT4Jk4V4QhaA+tmqeAHh0v8brNSO8=; b=U63KeK/Jz1CB5e5vDsOetkjRrxp3lBPKWDkwluNddzgbGbdLVVjNKB1A HU3tbjIckcXR/kRZS4VZYhIS/+60nUCsFHgill9LQ/Pi/NO1zjVI8AUoB cEwuqxQziOeZSs3eJj27qIF2XcvCmLekGMkRQ3aMV4E65Yhv2PILKikjA Dtt9L8xrts0zKISvObcYmp7bbjFxcDBQvMOJL143OLOpBbuNPCESCElH7 2mKP0j1tZZXmQnEcdnGWcCLkCd8LaUrkze5f8bG/SZXdB3NsByJte7lzW Yr10UlXhJByg3IaHMH3dZzXfObWOKzFxwZB0+F3fwGLwrq1loH8bKi1QG g==; X-CSE-ConnectionGUID: C1o0W+CFRAu5svSr91tgCw== X-CSE-MsgGUID: Pr9t5FSTSeq7fLY6T52dig== X-IronPort-AV: E=Sophos;i="6.08,254,1712613600"; d="scan'208";a="37520407" Received: from vmailcow01.tq-net.de ([10.150.86.48]) by mx1.tq-group.com with ESMTP; 21 Jun 2024 12:50:28 +0200 Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 67099160A30; Fri, 21 Jun 2024 12:50:23 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ew.tq-group.com; s=dkim; t=1718967024; h=from:subject:date:message-id:to:cc:mime-version: content-transfer-encoding; bh=SujQfNUHiwMLd2TT4Jk4V4QhaA+tmqeAHh0v8brNSO8=; b=so2t6f3GnI3475zAEnwbtMFPMIUFQSVs1JhyNws4s9L/GtbhjRy1sBCX0Ltb4WATXIMG2U PARHYa1e1EquHGhCXc1FGe53mh0HZpGF/f7os4JoBHWN7p7X9OxqnZ0fxqbEVj6XUt1OGW dohamr1gh4nLzwZHap5yrlig3p/BBP6euFZ0pe2aC8CRJjRBVI2QtFeD21QazROBGZjUL3 KJe7At0u7OVtY5b2Ha1Eg8zRO1Yt9Fo5T4v3mfn3eviEGhauDi1O/gtbK48SQ5zyWFQSyg PDcvi7C/Gq4RimLUzls0nOGj97+Y0lgLkTAuZTnKEdks5vfZnksg8AXj32rvsQ== From: Alexander Stein To: Ezequiel Garcia , Philipp Zabel , Mauro Carvalho Chehab , Hans Verkuil , Alex Bee , Jonas Karlman Cc: Alexander Stein , Nicolas Dufresne , Mauro Carvalho Chehab , linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/2] media: verisilicon: Move rockchip hardware drivers to the corresponding option Date: Fri, 21 Jun 2024 12:50:22 +0200 Message-Id: <20240621105024.4073007-1-alexander.stein@ew.tq-group.com> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Last-TLS-Session-Version: TLSv1.3 X-LSpam-Score: -2.5 (--) X-LSpam-Report: No, score=-2.5 required=5.0 tests=ARC_SIGNED=0.001,ARC_VALID=-0.1,BAYES_00=-1.9,DKIM_SIGNED=0.1,DKIM_VALID=-0.1,DMARC_PASS=-0.001,HEADER_FROM_DIFFERENT_DOMAINS=0.5,MAILING_LIST_MULTI=-1,SPF_HELO_NONE=0.001,SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no There is no need to compile the rockchip specific drivers if CONFIG_VIDEO_HANTRO_ROCKCHIP is not set. All driver functions are only referenced by rockchip_vpu_hw.c which is already under this option. Fixes: c9caebd57b3a ("media: hantro: merge Rockchip platform drivers") Fixes: c07665f99386 ("media: hantro: Add H.264 support for Rockchip VDPU2") Signed-off-by: Alexander Stein Reviewed-by: Nicolas Dufresne --- Changes in v2: * Split and just touch non-AV1 drivers As suggested by Nicolas split v1 patch into two separate ones with their corresponding Fixes tags. drivers/media/platform/verisilicon/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/media/platform/verisilicon/Makefile b/drivers/media/platform/verisilicon/Makefile index eb38a1833b02f..d483530b2feff 100644 --- a/drivers/media/platform/verisilicon/Makefile +++ b/drivers/media/platform/verisilicon/Makefile @@ -14,10 +14,6 @@ hantro-vpu-y += \ hantro_g2.o \ hantro_g2_hevc_dec.o \ hantro_g2_vp9_dec.o \ - rockchip_vpu2_hw_jpeg_enc.o \ - rockchip_vpu2_hw_h264_dec.o \ - rockchip_vpu2_hw_mpeg2_dec.o \ - rockchip_vpu2_hw_vp8_dec.o \ rockchip_vpu981_hw_av1_dec.o \ rockchip_av1_filmgrain.o \ rockchip_av1_entropymode.o \ @@ -35,6 +31,10 @@ hantro-vpu-$(CONFIG_VIDEO_HANTRO_SAMA5D4) += \ sama5d4_vdec_hw.o hantro-vpu-$(CONFIG_VIDEO_HANTRO_ROCKCHIP) += \ + rockchip_vpu2_hw_jpeg_enc.o \ + rockchip_vpu2_hw_h264_dec.o \ + rockchip_vpu2_hw_mpeg2_dec.o \ + rockchip_vpu2_hw_vp8_dec.o \ rockchip_vpu_hw.o hantro-vpu-$(CONFIG_VIDEO_HANTRO_SUNXI) += \ From patchwork Fri Jun 21 10:50:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Stein X-Patchwork-Id: 102667 X-Patchwork-Delegate: sebastian.fricke@collabora.com Received: from sv.mirrors.kernel.org ([139.178.88.99]) by linuxtv.org with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1sKbrC-0000Jv-1b for patchwork@linuxtv.org; Fri, 21 Jun 2024 10:51:03 +0000 Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id E3A53281EC8 for ; Fri, 21 Jun 2024 10:51:01 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 4EBDF172BDD; Fri, 21 Jun 2024 10:50:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=tq-group.com header.i=@tq-group.com header.b="BgGVOJDN"; dkim=fail reason="key not found in DNS" (0-bit key) header.d=ew.tq-group.com header.i=@ew.tq-group.com header.b="ouBe46y8" X-Original-To: linux-media@vger.kernel.org Received: from mx1.tq-group.com (mx1.tq-group.com [93.104.207.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9CF0017279B; Fri, 21 Jun 2024 10:50:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=93.104.207.81 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718967038; cv=none; b=KhcZovV0acRko9YjRYIt3kJi3Qrj5vPm/h/tbs0RzSdwwgKkJ31bCtfzLkTJE6XWGtTo9cA2kt3WDZrzegSDUp4fOychXEwwxToGt5P3aYWL7FZFyBtkxrjESF5f6t/U1C62tM9HeX44v/EuGarCIzfG0ATmA/wZvvLoJT9BQ0Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718967038; c=relaxed/simple; bh=Xd9ArVt9D6qUHzGjdOk+YL7pyp+kgskTMm7C0YaGULU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=WrBoPgGxYpJRUPFVSqmi2EOe5CybSiER22gCtF7ZxQnp5j9nyogtyailrwP/R2owxARuKFeCDrsxBtD9tD10CeX+x8rcF8T6NB7HTdnwW+rCgrbTmw2M/+R+alT9t1IKJgSpwI6beahwIGZ9sOuVIUfwshnmRA1P0aIE82YzYus= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=ew.tq-group.com; spf=pass smtp.mailfrom=ew.tq-group.com; dkim=pass (2048-bit key) header.d=tq-group.com header.i=@tq-group.com header.b=BgGVOJDN; dkim=fail (0-bit key) header.d=ew.tq-group.com header.i=@ew.tq-group.com header.b=ouBe46y8 reason="key not found in DNS"; arc=none smtp.client-ip=93.104.207.81 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=ew.tq-group.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ew.tq-group.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tq-group.com; i=@tq-group.com; q=dns/txt; s=key1; t=1718967036; x=1750503036; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=8dR59ljDyBjltzEYMcuGSSdeG1Qos47ZkJsUxIPmT7c=; b=BgGVOJDNm4lc952rcg5PsKz4varGo5FD3GN/OdcM7N5E2Qx86TaZdx2I pWxHOKYi065NbHjw+vDQ7p76oH7g1ezNfMPNGPheKmbitDSMcXYOJERcd dd1OHe+l/6fTuaX9+xfmD6wyQkQ+ELaHwWD4YNEnuV+txbiacQaXzhxCJ e/qwX3JeJ3HwFpmbQrxymohJ0T0k0St8UVm3l9wqyknp1NuMAcv+q0X22 0VTw9UezL900mHcxB8Jmz1Xxg0jSeBTjGo/hgUbeIYEOcJexyCoeocRy3 IztL5gVINJiuOXy6Yguo2mOJgEoD6qA4+kV8Q4d+ol6n7ivoySyegn3wI g==; X-CSE-ConnectionGUID: kjvoQ4aoSOWaN0hP2P+BXA== X-CSE-MsgGUID: psMX0Up/T021BRhyfXlUVw== X-IronPort-AV: E=Sophos;i="6.08,254,1712613600"; d="scan'208";a="37520408" Received: from vmailcow01.tq-net.de ([10.150.86.48]) by mx1.tq-group.com with ESMTP; 21 Jun 2024 12:50:33 +0200 Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 0CC56160A30; Fri, 21 Jun 2024 12:50:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ew.tq-group.com; s=dkim; t=1718967029; h=from:subject:date:message-id:to:cc:mime-version: content-transfer-encoding:in-reply-to:references; bh=8dR59ljDyBjltzEYMcuGSSdeG1Qos47ZkJsUxIPmT7c=; b=ouBe46y8XVukpUwYEHafVhqcIm0Y8nZjiHQhv8vTINVxbxy+rAYZi2eo4BdIG7Xk+a6M/V eqiiOxDO4Gxpgc2dOTUlMNtt2xtvXP0tTYRhbOndVESyQs3jiA98Vedm/CRZnnayG5Qf78 hZQ4RxJjxvfrYibQpt2Cph+rRWU5uLwsjrEdFBO3LPg5vQIfIE7eKHF1cARQKcy3IFvP2g 1M2J2NqF23oxexpVxIPsvMtI+eBXhKKl4//qD86FtSXvbUtSzEPy1AldN++H/3G9OMVZfS jvkF4jHQEEmQm5+qSendMMTKAFJVE6vgXAUhTGnv+WfVPvghM0FmNEkCgMdbWw== From: Alexander Stein To: Ezequiel Garcia , Philipp Zabel , Mauro Carvalho Chehab , Benjamin Gaignard , Hans Verkuil , Nicolas Dufresne Cc: Alexander Stein , linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/2] media: verisilicon: Move rockchip AV1 hardware drivers to the corresponding option Date: Fri, 21 Jun 2024 12:50:23 +0200 Message-Id: <20240621105024.4073007-2-alexander.stein@ew.tq-group.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240621105024.4073007-1-alexander.stein@ew.tq-group.com> References: <20240621105024.4073007-1-alexander.stein@ew.tq-group.com> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Last-TLS-Session-Version: TLSv1.3 X-LSpam-Score: -4.8 (----) X-LSpam-Report: No, score=-4.8 required=5.0 tests=ARC_SIGNED=0.001,ARC_VALID=-0.1,BAYES_00=-1.9,DKIM_SIGNED=0.1,DKIM_VALID=-0.1,DMARC_PASS=-0.001,HEADER_FROM_DIFFERENT_DOMAINS=0.5,MAILING_LIST_MULTI=-1,RCVD_IN_DNSWL_MED=-2.3,SPF_HELO_NONE=0.001,SPF_PASS=-0.001 autolearn=ham autolearn_force=no There is no need to compile the rockchip specific AV1 drivers if CONFIG_VIDEO_HANTRO_ROCKCHIP is not set. All driver functions are only referenced by rockchip_vpu_hw.c which is already under this option. Fixes: 727a400686a2 ("media: verisilicon: Add Rockchip AV1 decoder") Fixes: d8ebe59e7b36 ("media: verisilicon: Add film grain feature to AV1 driver") Fixes: c0d0e579db4e ("media: verisilicon: Add AV1 entropy helpers") Signed-off-by: Alexander Stein Reviewed-by: Nicolas Dufresne --- Changes in v2: * Split and just touch AV1 drivers As suggested by Nicolas split v1 patch into two separate ones with their corresponding Fixes tags. drivers/media/platform/verisilicon/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/media/platform/verisilicon/Makefile b/drivers/media/platform/verisilicon/Makefile index d483530b2feff..f6f019d04ff00 100644 --- a/drivers/media/platform/verisilicon/Makefile +++ b/drivers/media/platform/verisilicon/Makefile @@ -14,9 +14,6 @@ hantro-vpu-y += \ hantro_g2.o \ hantro_g2_hevc_dec.o \ hantro_g2_vp9_dec.o \ - rockchip_vpu981_hw_av1_dec.o \ - rockchip_av1_filmgrain.o \ - rockchip_av1_entropymode.o \ hantro_jpeg.o \ hantro_h264.o \ hantro_hevc.o \ @@ -35,6 +32,9 @@ hantro-vpu-$(CONFIG_VIDEO_HANTRO_ROCKCHIP) += \ rockchip_vpu2_hw_h264_dec.o \ rockchip_vpu2_hw_mpeg2_dec.o \ rockchip_vpu2_hw_vp8_dec.o \ + rockchip_vpu981_hw_av1_dec.o \ + rockchip_av1_filmgrain.o \ + rockchip_av1_entropymode.o \ rockchip_vpu_hw.o hantro-vpu-$(CONFIG_VIDEO_HANTRO_SUNXI) += \