From patchwork Mon Mar 24 11:48:52 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tomi Valkeinen X-Patchwork-Id: 14027105 X-Patchwork-Delegate: kieran@bingham.xyz 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 CD8391C8FBA; Mon, 24 Mar 2025 11:49:21 +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=1742816963; cv=none; b=JgRBAcn2ksYg0yREhRjIxWxF2ZsYlLYxD+zqAD4pCodF3v9tAi8APSAvYPVrHMDCz7EFyLaofTaov05d1+fmQGACycKuo5z+lIcqtvEF2OS9dWESIRqoZUj9x35vqXoNhbXB3Sp/aXETBbQoJop5AugvADHn4+qWnUTRqD3IhEQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742816963; c=relaxed/simple; bh=N64ITdRKfXrt4WCnwBdgiYbVM3m6EWxyjJ1k7m//CQc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=kPPrYxUpSlF2CFwSTaACiX1ARFvH7P4Ef4N5ewRKD9gFfJrpiQmSaqWVWGr/4NkrQTK0oOOGp80Nh30zQ8hRnmvG3P1Zq8dkGHiu+lzniMdtbkQAgTpfNj/TKKKyNfHxWc9sY6/6UECZK21Okjo570q/RIF1YNWYgO7pGPMFyU4= 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=rw+zXg4W; 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="rw+zXg4W" 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 722A8A8F; Mon, 24 Mar 2025 12:47:33 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1742816853; bh=N64ITdRKfXrt4WCnwBdgiYbVM3m6EWxyjJ1k7m//CQc=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=rw+zXg4WUJtOFAbF/oosPsk/Dyjrm0ceQhlQYz9v6wYU9TE+al8sOSHVNSoSmACH+ XPOHI9dkfVHgMBw4fGqSWpoBZCHfH5mf3TkoySZh12dzjD+n2nkSHki+6L22Y+nTfS 63W4mJfT7KI2EdP2+J68xj+CbvXW0LMo/1O27ii0= From: Tomi Valkeinen Date: Mon, 24 Mar 2025 13:48:52 +0200 Subject: [PATCH 1/3] media: rcar-vin: Add RCAR_GEN4 model value Precedence: bulk X-Mailing-List: linux-renesas-soc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250324-rcar-fix-raw-v1-1-ae56c1c7a2f6@ideasonboard.com> References: <20250324-rcar-fix-raw-v1-0-ae56c1c7a2f6@ideasonboard.com> In-Reply-To: <20250324-rcar-fix-raw-v1-0-ae56c1c7a2f6@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=3044; i=tomi.valkeinen+renesas@ideasonboard.com; h=from:subject:message-id; bh=N64ITdRKfXrt4WCnwBdgiYbVM3m6EWxyjJ1k7m//CQc=; b=owEBbQKS/ZANAwAIAfo9qoy8lh71AcsmYgBn4Ua9hwfHs5iF4NaMVGMY4hTEHe5Ob+YWxjQKA r9/4WH3muOJAjMEAAEIAB0WIQTEOAw+ll79gQef86f6PaqMvJYe9QUCZ+FGvQAKCRD6PaqMvJYe 9RPmD/9pcPdFouxXlAaZk8TVsJA32rq5zJ1qAPoAFPhp/J166jixl+Mis+BL++WJ6ivLYCLxOic 3M3od5Q94nc9P6phHCff9AriCRJ2uCjOaloTSxEXUYg3EhbWudNBnHxPdvIq33u7Nc8YZFSrIIQ vEeSjG0aKwxrwe4N0o1P5NaGwzzoa4MyIZ1z3Ztw9OJC4xDPYR6fOY57yFX8kdzDXzottPEOefs 62qAS7LX+Iq1YVQhiEMSmlXGHJ0g2ii0ND1lehhG95tWqwxZa/XQTg++fPoLVBBTqBw6DL6QJ/u dVqehJLk9a33XfaKSMEq5rbxuQY2oQFKWP9Dy1X+P996iRsplyQq2QucOOgn466k+K8wV646egz ue0MeE8bteETC3pa4vQWaNO1e1glFlMFkQYzLybADhWakUC2q56KKPAF+es6s9vrjBtCJEX2FC5 f7wF0ESfr/t7Zt4jR8ENRpuaHIHcmp04P1+58tUrpf2Bu8Nwowub0Mu3oY/E8rbWPswllZtRCGx D+O5BW2qSOZmlmHb5zu6HPulqs3H95CUNiQV6hvFiC2evps3HsX3AEqNpFxE5Vh9jgpyn5nMX6k D7veqyb1nBo0QO72d+xTRfRZCbFemZT466XtS9kCm5p66OcIcom6P9Q+JHhfET8t67fglgsJl6S AyKNwVp2fCSd9jQ== 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 Mon Mar 24 11:48:53 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tomi Valkeinen X-Patchwork-Id: 14027107 X-Patchwork-Delegate: kieran@bingham.xyz 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 1B77025E808; Mon, 24 Mar 2025 11:49:24 +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=1742816966; cv=none; b=diiLJ59lx6BUY86YbPjguh6sk+R2ajw8Tnj6CteJudYHk5sq1aaOy9a3t3xxPhqYvn8unSP5Jn8pMFqtSu5Xj00kp6bwiUGauDKSedEQG19rRSbLdzJhcGiNsRq0c1gV+elHtMjl01je1DkkHP2tzx7QtvBCu7+PqVDCCh4xDK8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742816966; c=relaxed/simple; bh=RrSA67qwssqhfifxPYWRTyJwoPe3eh1BW4LfV0QWXHs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=jvQuqOcvKpDrJZ1irZcw1JgY2QObeDWrhkWMtzCyanfBAKT0dD/5OL40IbUv5corSQReM6EyJg/oq3XJsemUxtu+lyf2uGW8qxU/xJS6b7EmAUiFsl9t1ljLsmwGh+jv+cB97rr45Fg74SRXx55DcyuPhRwVmvpnn8dXkdqRWN8= 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=T3WApZ0/; 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="T3WApZ0/" 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 0E4BD1059; Mon, 24 Mar 2025 12:47:34 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1742816854; bh=RrSA67qwssqhfifxPYWRTyJwoPe3eh1BW4LfV0QWXHs=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=T3WApZ0/gfyv7JM7+MHwGK6AJFPmFV522j+T7hwapW+fxVKlrd+qB/hDGKJeu5MPy YD71f6R6GsnvPjSqvpIr5MLWJaifQW0Wqyf06v43z+tCIa8cD7hqObxCNKSCzkcXm6 77whqCfjh/GEsxnKslbaIc5iQ8CAN4Kz4OY8ziyQ= From: Tomi Valkeinen Date: Mon, 24 Mar 2025 13:48:53 +0200 Subject: [PATCH 2/3] media: rcar-vin: Fix RAW8 Precedence: bulk X-Mailing-List: linux-renesas-soc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250324-rcar-fix-raw-v1-2-ae56c1c7a2f6@ideasonboard.com> References: <20250324-rcar-fix-raw-v1-0-ae56c1c7a2f6@ideasonboard.com> In-Reply-To: <20250324-rcar-fix-raw-v1-0-ae56c1c7a2f6@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=1189; i=tomi.valkeinen+renesas@ideasonboard.com; h=from:subject:message-id; bh=RrSA67qwssqhfifxPYWRTyJwoPe3eh1BW4LfV0QWXHs=; b=owEBbQKS/ZANAwAIAfo9qoy8lh71AcsmYgBn4Ua+po76ao1/MbJy17NIE3XWkhEqpiKs2kEZ/ i89Bsh5sgiJAjMEAAEIAB0WIQTEOAw+ll79gQef86f6PaqMvJYe9QUCZ+FGvgAKCRD6PaqMvJYe 9SvFEACmyI/fjlnjn0PO9T/JrKtx7gYe5fQnxOirywlNza1WoGjedoQkh3dj/30oOjgRilFXa+u jQVzuGYFvaAc2nTje3HdFeaHeTeXze8cxxqzYfLBis6/oc1Z8xi6Ovk74vg3C9aVoPQ2+UkLWmP ZzIKLW0p22U/RWmMKs+rywzvdf/yPxLSCDXPjVJrZxHqLMZK3jewj5/fYOZQfm0GJVE+zJpkYNA yZddB+3i6oAybbH466IiUCgnDPW9dEOl64wqfy4s1LrCxdYiYd9RmdhUdpUUm25V6ig3S8a1EPu sT25xGBuPfLE7HSBgll6FONqtRNEiw8Rfo+m8qOYjbs5fH1q1lzo1LlgZYFmGL0+dAA/euAEC5X VKXkOhPMXLl1hjbgEZ6jcleoAL+jnv3dirp/q41ZWk7TZGxLKeCaSMp+clr+5NLxFPct1qAGDfy /HjuaZcGUTQvY40irbT+lDwrBaJCV50fW7RXgFTIHuWPJrobhL6hDv/xB0wJy1L/DY7vlESXSbM eMMXnKzGNPTNRDGCkobqGLw53lwSa9LziZSHZ8eDNr1LLqBSknlIvDjxbjDyd801I7C73WrSsjZ DJZniZLYkqF1e/sBmTnLa0jlmOUK09cUIbij/ockEOr1M+GNG64qs8+JFtr4QUh8TTNRBG3i/gX RKIbgsA0xQXXHcw== 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 972ae2cb3314..53046614f7a1 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: From patchwork Mon Mar 24 11:48:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomi Valkeinen X-Patchwork-Id: 14027106 X-Patchwork-Delegate: kieran@bingham.xyz 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 D3B2725E803; Mon, 24 Mar 2025 11:49:24 +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=1742816966; cv=none; b=AndQ77Wd7el0nSNS1mv/8KHe1rRLlfie5CdpSUxKdUyaqyS8Pr5FIrotP6o4gZEVe9E9d+FJks4Sc+GQrXW+2QRznxWW7wiNqulmCQ5fnpAe/A2pYS/dyJY5+R0v0rhDzFzOU6VKwgPQGJLVCWTy8fZQR8qLbpbinOTX3g968m4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742816966; c=relaxed/simple; bh=aLanm0QqoHMeJ689eljYWwN7d8uu1F99MXdNNkMINrc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=quEAMh0awVqBTOo9ENVyY+WKY6SHCX/vbuj5jZszITcdfja+T1v7ZLYfz60scJES36AHkkcPvf5cfAUA+iR7A+rU13K80qA2eWwPPhbGc+ikgiK5zv87mlSB/QtGCLSXOgTPLEWGDEQcF7mIfo7sCNcRh9By7mAX5Tc4Mz9DOaI= 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=V8s1npky; 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="V8s1npky" 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 9EFB510DD; Mon, 24 Mar 2025 12:47:34 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1742816855; bh=aLanm0QqoHMeJ689eljYWwN7d8uu1F99MXdNNkMINrc=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=V8s1npky6WU6sKCA+fmXIjaiqdBUVAKdW4Z76dw2KXapqCJzmC+OFP2q4D23TC8gx dAUP0BcLt0mzbfp68K7EMqAF3xRxFMI1cJzsJpoCZLY3FVv/+Dw/LRYDs0febTsxqs eEau9qJdwXMJu180J45xIu0Soscuz6ryRWf948ak= From: Tomi Valkeinen Date: Mon, 24 Mar 2025 13:48:54 +0200 Subject: [PATCH 3/3] media: rcar-vin: Fix RAW10 Precedence: bulk X-Mailing-List: linux-renesas-soc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250324-rcar-fix-raw-v1-3-ae56c1c7a2f6@ideasonboard.com> References: <20250324-rcar-fix-raw-v1-0-ae56c1c7a2f6@ideasonboard.com> In-Reply-To: <20250324-rcar-fix-raw-v1-0-ae56c1c7a2f6@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=2817; i=tomi.valkeinen+renesas@ideasonboard.com; h=from:subject:message-id; bh=aLanm0QqoHMeJ689eljYWwN7d8uu1F99MXdNNkMINrc=; b=owEBbQKS/ZANAwAIAfo9qoy8lh71AcsmYgBn4Ua+hTUbk4ltQ36kDYhFUqSslrROA+tQb66X6 iEo6cMsdSqJAjMEAAEIAB0WIQTEOAw+ll79gQef86f6PaqMvJYe9QUCZ+FGvgAKCRD6PaqMvJYe 9SMFEACnEV5Ruyo+GmMLFswQoyA0NRzaDyRVzc2rmavXTDG085zhHNsH6xbZXOQX0Br1rRsLEfv u1NK22mA9526XgX4wRJvZLFpWED/+3Wk6f+UOxwE7iGFbbnbPo7bpJv1P12Fx/XpVvbdic6+IrK NPc5HHNjqP+5jukKEnomJiwivKhD5mLDrtn3NE7FxWY2+yt+AqsD6ycU9wRsgihMAsuyMeCZ2eS N8pVY9VOiY6xo0odX5sGcB5N4oE8DSC55Mk45QJ95BQd83jiOIuCEHQQ3RN07DKB32GH/cOt/tR aIu2RfwLXXuTgguQEAAFcxCjmqw0yfIOptu8t6bDIKJk+6QsOEHElFBSsDVTjlT4hS79C0QuhpR aLHh8qly5F/IT9YJ8PXrIUfTShdLhy381Td5f0yNaoh630HUjGX/Wl1ZF3pAY5gl02YQKLvWAIx RS0z7+ZmeRECa2Hei5m8WAk4UGGZi+gm061yD7Gj0AripPyclQ/C6bPGm16qYQmZAdP1/ArJzmN ZlTF5JeVPyaWwAM6xKWPAaOFm7Ss2312YFHqmgJDojxu5dPpNwYYUWLRIVfURIXdXfe+MyKUgA2 n4aet++LA0nVOSfhczIJS4t20Z493mUK+6YRTtIC4tUgWjV2fjiJVW2nPefhX/sfYuD6kH1B4mk /1rN0pot3LP7WMA== X-Developer-Key: i=tomi.valkeinen+renesas@ideasonboard.com; a=openpgp; fpr=C4380C3E965EFD81079FF3A7FA3DAA8CBC961EF5 Fix the following to get RAW10 formats working: In rvin_formats, the bpp is set to 4 for RAW10. As VIN unpacks RAW10 to 16-bit containers, the bpp should be 2. Don't set VNDMR_YC_THR to the VNDMR register. The YC_THR is "YC Data Through Mode", used for YUV formats and should not be set for RAW10. Fix the check related to the RGB666 format and CSI-2 mode. The VNMC_INF_RGB666 define is the same as used for RAW10 on Gen4, and RAW10 is allowed on CSI-2 (whereas RGB666 is not allowed on Gen3 on CSI-2). This feels a bit hacky, though, and the formats should really have been verified already earlier. Fixes: 1b7e7240eaf3 ("media: rcar-vin: Add support for RAW10") Signed-off-by: Tomi Valkeinen --- drivers/media/platform/renesas/rcar-vin/rcar-dma.c | 9 +++++++-- drivers/media/platform/renesas/rcar-vin/rcar-v4l2.c | 8 ++++---- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/drivers/media/platform/renesas/rcar-vin/rcar-dma.c b/drivers/media/platform/renesas/rcar-vin/rcar-dma.c index 53046614f7a1..f8394be8a922 100644 --- a/drivers/media/platform/renesas/rcar-vin/rcar-dma.c +++ b/drivers/media/platform/renesas/rcar-vin/rcar-dma.c @@ -811,12 +811,17 @@ static int rvin_setup(struct rvin_dev *vin) case VNMC_INF_YUV8_BT656: case VNMC_INF_YUV10_BT656: case VNMC_INF_YUV16: - case VNMC_INF_RGB666: if (vin->is_csi) { vin_err(vin, "Invalid setting in MIPI CSI2\n"); return -EINVAL; } break; + case VNMC_INF_RGB666: + if (vin->info->model == RCAR_GEN3 && vin->is_csi) { + vin_err(vin, "Invalid setting in MIPI CSI2\n"); + return -EINVAL; + } + break; case VNMC_INF_RAW8: if (!vin->is_csi) { vin_err(vin, "Invalid setting in Digital Pins\n"); @@ -913,7 +918,7 @@ static int rvin_setup(struct rvin_dev *vin) case V4L2_PIX_FMT_SGBRG10: case V4L2_PIX_FMT_SGRBG10: case V4L2_PIX_FMT_SRGGB10: - dmr = VNDMR_RMODE_RAW10 | VNDMR_YC_THR; + dmr = VNDMR_RMODE_RAW10; break; default: vin_err(vin, "Invalid pixelformat (0x%x)\n", diff --git a/drivers/media/platform/renesas/rcar-vin/rcar-v4l2.c b/drivers/media/platform/renesas/rcar-vin/rcar-v4l2.c index 756fdfdbce61..65da8d513b52 100644 --- a/drivers/media/platform/renesas/rcar-vin/rcar-v4l2.c +++ b/drivers/media/platform/renesas/rcar-vin/rcar-v4l2.c @@ -88,19 +88,19 @@ static const struct rvin_video_format rvin_formats[] = { }, { .fourcc = V4L2_PIX_FMT_SBGGR10, - .bpp = 4, + .bpp = 2, }, { .fourcc = V4L2_PIX_FMT_SGBRG10, - .bpp = 4, + .bpp = 2, }, { .fourcc = V4L2_PIX_FMT_SGRBG10, - .bpp = 4, + .bpp = 2, }, { .fourcc = V4L2_PIX_FMT_SRGGB10, - .bpp = 4, + .bpp = 2, }, };