From patchwork Thu Apr 24 07:05:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tomi Valkeinen X-Patchwork-Id: 884127 Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) (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 97EAD1E0E0C; Thu, 24 Apr 2025 07:06:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=213.167.242.64 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745478394; cv=none; b=K4ObQL1n1BJ70dbK7pcGbR8/QyTIp8Ywx+KNhkI/xM11wBZ0dDbxuLDjlzUQPy1yPF4mhEBHmNB1ieJhy/P63jXpduJhVyTZmyEyNrddglHLkdP1oIk6ZC08m3iLV69iXPwfmFalR56s//Cj7uVFUjcc6L0EmNZ4iepWpjC18AA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745478394; c=relaxed/simple; bh=zpw2BmTkwqCgwgXl+ftJyityMF1OTsK2895rFqug5l0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=goZA7NaCD36GR2hhQr1w+yr5BIiaSbdC81gYDtxoZBggTDR2U2I1dxn1vFF8migtSiMf/a0aecUBPEr2NorS7Whzwg4UGpzVyWj6JosVk0FYITGm1CQN9UHMbfN/Rervj7brXkdfvMKCdDhp6EkV4T8Be6B4gjDZeSfhY+WEQ2M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ideasonboard.com; spf=pass smtp.mailfrom=ideasonboard.com; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b=YHJUX2Ja; arc=none smtp.client-ip=213.167.242.64 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ideasonboard.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ideasonboard.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="YHJUX2Ja" Received: from [127.0.1.1] (91-158-153-178.elisa-laajakaista.fi [91.158.153.178]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id D48EDF01; Thu, 24 Apr 2025 09:06:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1745478386; bh=zpw2BmTkwqCgwgXl+ftJyityMF1OTsK2895rFqug5l0=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=YHJUX2Ja25Ny3T3a0E49fi+tPT2Oxg/l/YZQNqvF9BqxBFofjmNYlaBpE0ClIP6ZI LxxSrzj8Rdt8FsO9qsZJ8eyt2HhfwWUy3KBCjDMefTqqM3S4owQoG5gAEMAxAF1AFR EoLQK1bmu3MgHAlZfFa8qpVDz5mMUJ+Wo8+zeWVQ= From: Tomi Valkeinen Date: Thu, 24 Apr 2025 10:05:33 +0300 Subject: [PATCH v2 1/4] media: rcar-vin: Add RCAR_GEN4 model value Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250424-rcar-fix-raw-v2-1-f6afca378124@ideasonboard.com> References: <20250424-rcar-fix-raw-v2-0-f6afca378124@ideasonboard.com> In-Reply-To: <20250424-rcar-fix-raw-v2-0-f6afca378124@ideasonboard.com> To: =?utf-8?q?Niklas_S=C3=B6derlund?= , Mauro Carvalho Chehab , Sakari Ailus Cc: linux-media@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-kernel@vger.kernel.org, =?utf-8?q?Niklas_S=C3=B6derlund?= , Mauro Carvalho Chehab , Tomi Valkeinen X-Mailer: b4 0.15-dev-c25d1 X-Developer-Signature: v=1; a=openpgp-sha256; l=3186; i=tomi.valkeinen+renesas@ideasonboard.com; h=from:subject:message-id; bh=zpw2BmTkwqCgwgXl+ftJyityMF1OTsK2895rFqug5l0=; b=owEBbQKS/ZANAwAIAfo9qoy8lh71AcsmYgBoCeLxtqyiM2FlZxxbGYRsf5SFoiOl2mtx2YPeu vqzCMfDVzmJAjMEAAEIAB0WIQTEOAw+ll79gQef86f6PaqMvJYe9QUCaAni8QAKCRD6PaqMvJYe 9X3JD/0dZbokS6Mkx6xOBSKFtv01y26NQ8tMRl6lq1yQVk6hC00/PozntGlFtSufOZtXj0RLiua jWgfzmWrY98WGSU5mk/k+VoCNqROJ6I2E9rxb5qh+2wACT0bbI+igwal5WEQlO37+BtOaR3HFiv s5Ax4xiN1MO50V8jIIY2YQKVtcGmEgtIeHotiMaKxjHo2byr96tNiQtHxUlpIbBPlJqlFlnBrR7 lbau4emsnAJ1CmlxwWt11uIhsDqllrtbguiUG/b3ulWENpXvKAqZuIjT0OvkwuwxXiKHHTGFOlF k3LZm/76k9UiiYMsfJIc+KOvGl21y+lpkdxo01rIDVdhk2yRcDFZZd6N1rNeGTm106aWSBP0FDQ zeC3gBcDoNMgXKMsPOLLIHcCacE202AU/WmhnIH7I3gDlaMKKbb7hn4HUM0xzLi0CBYT3PAuKaI KCW7IAh2Z2OTrovfu/RoJViaKQdhtiADuokOeMlLue4I1ObvsqI5wj3ZaCt12mJGd7OcpGL7nkK AGIlAE9TpUVRBJihqW3ID/+wjbYwPPR5+v0uLrHlah5mVuPASmqkeCpQbzqQuiK6ORXzuYUECfN MNF09bEveahf/ibwhcFLRZSF55BmlYalebzOoZzmwmGp5HSenM9E43FO/eotvoibb+NritvgmHA fACuA2HVULzn2+w== X-Developer-Key: i=tomi.valkeinen+renesas@ideasonboard.com; a=openpgp; fpr=C4380C3E965EFD81079FF3A7FA3DAA8CBC961EF5 Currently Gen4 VINs are marked as RCAN_GEN3 models. Add a new enum value, RCAR_GEN4, and use it for Gen4 VINs. No functional changes in this patch. Signed-off-by: Tomi Valkeinen Reviewed-by: Niklas Söderlund Tested-by: Niklas Söderlund --- drivers/media/platform/renesas/rcar-vin/rcar-core.c | 2 +- drivers/media/platform/renesas/rcar-vin/rcar-dma.c | 8 ++++---- drivers/media/platform/renesas/rcar-vin/rcar-vin.h | 1 + 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/media/platform/renesas/rcar-vin/rcar-core.c b/drivers/media/platform/renesas/rcar-vin/rcar-core.c index ddfb18e6e7a4..88989c5fe636 100644 --- a/drivers/media/platform/renesas/rcar-vin/rcar-core.c +++ b/drivers/media/platform/renesas/rcar-vin/rcar-core.c @@ -1275,7 +1275,7 @@ static const struct rvin_info rcar_info_r8a77995 = { }; static const struct rvin_info rcar_info_gen4 = { - .model = RCAR_GEN3, + .model = RCAR_GEN4, .use_mc = true, .use_isp = true, .nv12 = true, diff --git a/drivers/media/platform/renesas/rcar-vin/rcar-dma.c b/drivers/media/platform/renesas/rcar-vin/rcar-dma.c index 8de871240440..972ae2cb3314 100644 --- a/drivers/media/platform/renesas/rcar-vin/rcar-dma.c +++ b/drivers/media/platform/renesas/rcar-vin/rcar-dma.c @@ -803,7 +803,7 @@ static int rvin_setup(struct rvin_dev *vin) } /* Make sure input interface and input format is valid. */ - if (vin->info->model == RCAR_GEN3) { + if (vin->info->model == RCAR_GEN3 || vin->info->model == RCAR_GEN4) { switch (vnmc & VNMC_INF_MASK) { case VNMC_INF_YUV8_BT656: case VNMC_INF_YUV10_BT656: @@ -826,7 +826,7 @@ static int rvin_setup(struct rvin_dev *vin) } /* Enable VSYNC Field Toggle mode after one VSYNC input */ - if (vin->info->model == RCAR_GEN3) + if (vin->info->model == RCAR_GEN3 || vin->info->model == RCAR_GEN4) dmr2 = VNDMR2_FTEV; else dmr2 = VNDMR2_FTEV | VNDMR2_VLV(1); @@ -926,7 +926,7 @@ static int rvin_setup(struct rvin_dev *vin) if (input_is_yuv == output_is_yuv) vnmc |= VNMC_BPS; - if (vin->info->model == RCAR_GEN3) { + if (vin->info->model == RCAR_GEN3 || vin->info->model == RCAR_GEN4) { /* Select between CSI-2 and parallel input */ if (vin->is_csi) vnmc &= ~VNMC_DPINE; @@ -1351,7 +1351,7 @@ static int rvin_mc_validate_format(struct rvin_dev *vin, struct v4l2_subdev *sd, if (rvin_scaler_needed(vin)) { /* Gen3 can't scale NV12 */ - if (vin->info->model == RCAR_GEN3 && + if ((vin->info->model == RCAR_GEN3 || vin->info->model == RCAR_GEN4) && vin->format.pixelformat == V4L2_PIX_FMT_NV12) return -EPIPE; diff --git a/drivers/media/platform/renesas/rcar-vin/rcar-vin.h b/drivers/media/platform/renesas/rcar-vin/rcar-vin.h index f87d4bc9e53e..34bbd1343bf6 100644 --- a/drivers/media/platform/renesas/rcar-vin/rcar-vin.h +++ b/drivers/media/platform/renesas/rcar-vin/rcar-vin.h @@ -39,6 +39,7 @@ enum model_id { RCAR_M1, RCAR_GEN2, RCAR_GEN3, + RCAR_GEN4, }; enum rvin_csi_id { From patchwork Thu Apr 24 07:05:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tomi Valkeinen X-Patchwork-Id: 884126 Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) (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 EDA7E1F3B8C; Thu, 24 Apr 2025 07:06:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=213.167.242.64 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745478397; cv=none; b=fK+WZEcIu896MAB2E0y2R5e60DNVFki7UoKibdF5U3omdbTmGyJEOlBRFCyZj9IgTKYVTGM0zRe3c4XGruo8ZYaZ1LtRVC9Y8Ayk73oPF3DObbv2iUX/N6m1CeY1GdHZ0msCtzMN9q9yDDmQCQdQTK3VhNvRFLuMlSjLF0+pQSg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745478397; c=relaxed/simple; bh=oj+fFJoHfQcRJ3PXsFuMdFCpas7geU0lbK+c1i7FPNY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=qLkED9u+xJge5F+7+jL911tRE98Cx1GWBp18A9sVbcLla7CD1dXMkJ3zM9V18EccwlleDSLNaaX5859nvW+Umf0vrjOaBiqcqbV1EjV0FxbU0aLZnuzkCZFwWVn1Tr9y8MV8HZJ0hsy6MKwDvBINL45TU8jWCrOdx3o+QpRODuQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ideasonboard.com; spf=pass smtp.mailfrom=ideasonboard.com; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b=lGSjY4hT; arc=none smtp.client-ip=213.167.242.64 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ideasonboard.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ideasonboard.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="lGSjY4hT" Received: from [127.0.1.1] (91-158-153-178.elisa-laajakaista.fi [91.158.153.178]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 18BCA1440; Thu, 24 Apr 2025 09:06:27 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1745478387; bh=oj+fFJoHfQcRJ3PXsFuMdFCpas7geU0lbK+c1i7FPNY=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=lGSjY4hTPyPAQZinZULVeZI0ap1FhTN90GhwCz5l8e9swfCpdkKsO0wyl6IHUYUnY 8r8ImMXp6SAYOZL33584gjnkliVaoORwOf306oi/b73Qj4nuMRqs97IR4PeBhjrDGQ ro11WeFsHnLdtSh03pd5EFHMwxPay9fDNZCnkmgQ= From: Tomi Valkeinen Date: Thu, 24 Apr 2025 10:05:35 +0300 Subject: [PATCH v2 3/4] media: rcar-vin: Fix RAW8 Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250424-rcar-fix-raw-v2-3-f6afca378124@ideasonboard.com> References: <20250424-rcar-fix-raw-v2-0-f6afca378124@ideasonboard.com> In-Reply-To: <20250424-rcar-fix-raw-v2-0-f6afca378124@ideasonboard.com> To: =?utf-8?q?Niklas_S=C3=B6derlund?= , Mauro Carvalho Chehab , Sakari Ailus Cc: linux-media@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-kernel@vger.kernel.org, =?utf-8?q?Niklas_S=C3=B6derlund?= , Mauro Carvalho Chehab , Tomi Valkeinen X-Mailer: b4 0.15-dev-c25d1 X-Developer-Signature: v=1; a=openpgp-sha256; l=1331; i=tomi.valkeinen+renesas@ideasonboard.com; h=from:subject:message-id; bh=oj+fFJoHfQcRJ3PXsFuMdFCpas7geU0lbK+c1i7FPNY=; b=owEBbQKS/ZANAwAIAfo9qoy8lh71AcsmYgBoCeLxLtIl18/sWDlYUgTt9ceDY75tV9cr1LA+b EtMqWN62BeJAjMEAAEIAB0WIQTEOAw+ll79gQef86f6PaqMvJYe9QUCaAni8QAKCRD6PaqMvJYe 9byGD/4j/YyQSfZsHYK4jyYazTJ8ufD8rMn/ZEq4U8YUWZmWaqjA+O/NoTVvbR2cPTGc91134zM wTjffBIsMnn58xnvOxRVcecxNKhtPzdCLuC7fMGCEcorgXRtv2EGlCDcwYr3SL+COf4oPuBsZO0 8eO3cs+JGS0s6FLqTttDgXkXkrv0ZNVcK2FqKN33ZfR/UgYljZ4SRyOeJNtHa/t3UUqoQnqGOtw bXXFbtPjgQIUAVW9auu1INMv4NLd8um4tQgUJUaQ7IIRSMdpcbQwBR46f6B1rQJqo4+ip4wz/IP 33077gAfXLAuCljGnp/KjSjUBJj1JKID18bqAKsZkJo2QtlyK1t4Erjl/Cq0ZU03SF2eElYQ2mA WjjS6p1q7LsHous5/r/n76RU6S6w8ZOMojYiwj0IYZe+MV5jwyO6ab8J6vLii7x6Wz7Y5iKDHjB tEY+EkxNAXt0Qs+E+3E67WveoChGbCAEQ/mIWb1JsWBTUyGpKoItbuVykD/n7HZXQ9M6kz/s0nh uVtp/In3sIY4xPgR6n6X4s8p4JofBAmyKc8mNTmxve93uNIc7YaceWTsqJKsw/NZrqTOJ/ffey8 NcDlqGxgL76bf+GHu2p/cLp+24uqAwUYVkpeUXG4JcbcP+z0Pwo+CT8a3W2Vk2XDGkH6h0kWWBm vMjqn4lV0DtdzBQ== X-Developer-Key: i=tomi.valkeinen+renesas@ideasonboard.com; a=openpgp; fpr=C4380C3E965EFD81079FF3A7FA3DAA8CBC961EF5 On Gen4 we need to set VNMC's EXINF to a different value (1) than in Gen3 (0). Add a define for this, and set the bit for Gen4. Signed-off-by: Tomi Valkeinen Reviewed-by: Niklas Söderlund Tested-by: Niklas Söderlund --- drivers/media/platform/renesas/rcar-vin/rcar-dma.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/media/platform/renesas/rcar-vin/rcar-dma.c b/drivers/media/platform/renesas/rcar-vin/rcar-dma.c index 0b5077e2e989..a38c7b835231 100644 --- a/drivers/media/platform/renesas/rcar-vin/rcar-dma.c +++ b/drivers/media/platform/renesas/rcar-vin/rcar-dma.c @@ -94,6 +94,7 @@ #define VNMC_INF_YUV16 (5 << 16) #define VNMC_INF_RGB888 (6 << 16) #define VNMC_INF_RGB666 (7 << 16) +#define VNMC_EXINF_RAW8 (1 << 12) /* Gen4 specific */ #define VNMC_VUP (1 << 10) #define VNMC_IM_ODD (0 << 3) #define VNMC_IM_ODD_EVEN (1 << 3) @@ -791,6 +792,8 @@ static int rvin_setup(struct rvin_dev *vin) case MEDIA_BUS_FMT_SRGGB8_1X8: case MEDIA_BUS_FMT_Y8_1X8: vnmc |= VNMC_INF_RAW8; + if (vin->info->model == RCAR_GEN4) + vnmc |= VNMC_EXINF_RAW8; break; case MEDIA_BUS_FMT_SBGGR10_1X10: case MEDIA_BUS_FMT_SGBRG10_1X10: