Received-SPF: pass (google.com: domain of linux-kernel+bounces-72719-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
From: Michael Riesch <michael.riesch@wolfvision.net>
Date: Tue, 20 Feb 2024 10:39:21 +0100
Subject: [PATCH 11/14] media: rockchip: cif: make scaler support variant
 specific
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
Message-Id: <20240220-v6-8-topic-rk3568-vicap-v1-11-2680a1fa640b@wolfvision.net>
References: <20240220-v6-8-topic-rk3568-vicap-v1-0-2680a1fa640b@wolfvision.net>
In-Reply-To: <20240220-v6-8-topic-rk3568-vicap-v1-0-2680a1fa640b@wolfvision.net>
To: Mehdi Djait <mehdi.djait.k@gmail.com>, 
 =?utf-8?q?Th=C3=A9o_Lebrun?= <theo.lebrun@bootlin.com>, 
 Thomas Petazzoni <thomas.petazzoni@bootlin.com>, 
 Laurent Pinchart <laurent.pinchart@ideasonboard.com>, 
 Mauro Carvalho Chehab <mchehab@kernel.org>, 
 Rob Herring <robh+dt@kernel.org>, 
 Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>, 
 Conor Dooley <conor+dt@kernel.org>, Heiko Stuebner <heiko@sntech.de>, 
 Sakari Ailus <sakari.ailus@linux.intel.com>
Cc: linux-media@vger.kernel.org, devicetree@vger.kernel.org, 
 linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, 
 linux-rockchip@lists.infradead.org, 
 Michael Riesch <michael.riesch@wolfvision.net>
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?utf-8?B?blpaT1B1TERZYXhDL2pJTXlOUG00b2hQeUtxQTNrNzNCRHdLdFlFN1E4dTk2?=
 =?utf-8?B?cmtZSDFhTm82Sm04T0RPbFlnM0lvS05kRHNpMlR3eVNncTAyTFk2T2paUlJz?=
 =?utf-8?B?dnhod3lpYStWR1dyTWdaOEVVa29OSUJ6aXBYclB1SVgwVWxyT2l0YXlSUnho?=
 =?utf-8?B?eEZQWU96WERFT1FYeU10cWUzWHFDVUdZM0NHU3RhWFNtdHB0aXNVbnVSbXQx?=
 =?utf-8?B?ZDBjNThYblM1NEpqTXdOTHdjK3BUYUQzS1lPM3hvRW14WXN4TUdScGJiZzdi?=
 =?utf-8?B?bVFTUlRHcVoyZG5icHNaUW9kbHJhRG9aRzcvZzRWSFl2czNxeG5BTUt1ZmFk?=
 =?utf-8?B?ZHBKc3Q0aWY4aEZPcVhxYTJjQUcxd0RBKys1S0lJVTVIVEdyc3dVcDhOdmdC?=
 =?utf-8?B?M1haZ3ErWHdVNzIxTU1wdEZNcnZCVVdLOHoxZTRoOWZTRjVOK0Rad21LVmlG?=
 =?utf-8?B?ZzFpZFZESjkvazRlTkh5L2ZCVFFjdENwZm9qU1BwOWlVTzhyRytXTDBsQnpK?=
 =?utf-8?B?c1BlNHdEQ3MwdGlzR0hpS1JmRkxQbkkzQVR0SFNZOGtwNW5TbTh4czQxUkNG?=
 =?utf-8?B?WlpNOUhRTXo1dTdhQ3F2QWNka0VyL1hDM0xNSDBXRURWNWZQaVk2eFd0WUZW?=
 =?utf-8?B?Mnd6RE8wdEExeFFhMThwOW5qU1VKdFR2WmdGMHN1VTI3Q1pTM3QwRGZOYm1Y?=
 =?utf-8?B?cnJXT2gwbmU5dnc0dEFlZ3FGT29nWlZod3p2L1kxVWxnWTJHbFhYZTIrZUNy?=
 =?utf-8?B?UmdpOGFUNFFTK0paK0xRTDQvcXpxWDA3cUVuT0Ztc3VtcFBnU014aThrTXU3?=
 =?utf-8?B?VTVFQUNuVmFRZ2k0UUJjM3NUdkZ0eDFRaDZSbFdhcE04MUIyZzJvL040aDkv?=
 =?utf-8?B?WnNPWFdDYURxdHhUYktVSVZKYmxFR0krS2pMRFpwT2ZaTW9xbFZLQ3JoanVn?=
 =?utf-8?B?SVF4dUZEbTdMYldkUDAvanZnMDRib3VSekluVlo0QXM4a1ZDRXFPaE4vN0Zl?=
 =?utf-8?B?UGhMY1c5b0puMm1nOURLYmVyZGlTUjJrdHczeWt2dnpOeUc2ajBWQjNGM09F?=
 =?utf-8?B?U1VENVdoQ0Njb3cwUFEwY1ptd25qZkc3c3Bpc21hamx5SzNVOFFZRXA0aWFl?=
 =?utf-8?B?UXpmWTNRWUFUKzduam1mSmt3b003a0xyYXg1VkV4cUthUElPREI0aUVtcVlt?=
 =?utf-8?B?eDZRVnBVNi81RjRtSjNwZzdaQVZnbXNDZ25OSzcxTzhIRGxNSmhNcXlFNTVy?=
 =?utf-8?B?YzdFb2I0V1RIR1pJL0lUaG1keW45V1RGRmRvSVVoTm5JYXNsNzR5K2p3WjNN?=
 =?utf-8?B?Tk55cTBnUVFoWVBHM1BZZjhsN3FNZGVEd3Vlc09oTWE3SEN3eExFczgvME02?=
 =?utf-8?B?azV6U0QzblJoVEpLQzNnSWVhWEJnN0NSQkRLVEpwbmxpTnVxRDNkL2Y0YStV?=
 =?utf-8?B?SXFaK2xNZ0NrcWFScW1LZG5EZ0RSUVpRQTNHeE0wS2dOZ2h3d1p5d1dvUjlI?=
 =?utf-8?B?N1NEZEt5NFgrS1Z2QTQ1bUlETmZ2MjgxTE1DSENJclhvZVRRNHlXOFdUYW1x?=
 =?utf-8?B?bVR3WTNMUHBESzgxeStzR2dlOCtBWTJRblIyTGtydVljN2VVa1UwY2FrRzN0?=
 =?utf-8?B?YnJPMEY5b3dEaUwyOVNRNXZrQXlFdlR0OEg3OVVNOXVPUW5wcEkwQjVSNWt4?=
 =?utf-8?B?Y0FWdGJzaGsya1grellVVmRPVjUzV0J4Uy9nckxBQisram8yWkNJMmptalYw?=
 =?utf-8?B?bjdIWlFBdFErRWhPUW9tZUtDVmNEUnV5VE0ybHl1SDgyemE1QmxRa2dlcm1q?=
 =?utf-8?B?aGI1N1NzMWU2M09XRnhaQ2RoTm1HN0VzZi80SEZVUlNKS3NxbCtpOXJmMmdT?=
 =?utf-8?B?ajN4YWxOeXhEU24zb2tqTmhxblNsS3BJYUs0UXBZZjh3L3Y0MVFnWmtXblcr?=
 =?utf-8?B?Y2s2b0pnenJ1SEhFR0lNNTJoRnd1VUJWTFl2bm03eHA3L3NwYThOMXp5Y3VM?=
 =?utf-8?B?bUJrVFdic1NXWDJiMENOUlpTWHBjWG9wRVlxbzRVVXFmNWlMK3VHOEtOblla?=
 =?utf-8?B?d0pnamVrZHg4L2VXTlBIUnAyYUhtcitCTWo4VFFucURyVmdZNjF6d2ExZTUx?=
 =?utf-8?B?MUYzeTNta0piTjVRbmY1cHAwYW5zUkloUHBmcC9WR1dtY2ZSUG91SmRPZmxu?=
 =?utf-8?B?a2c9PQ==?=
X-OriginatorOrg: wolfvision.net
X-MS-Exchange-CrossTenant-Network-Message-Id: 7a234b08-1930-4e5d-6b24-08dc31f7f2fd
X-MS-Exchange-CrossTenant-AuthSource: DU0PR08MB9155.eurprd08.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Feb 2024 09:40:18.3847
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: e94ec9da-9183-471e-83b3-51baa8eb804f
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: Wv2d/9lCYFsPXsR/cp93EfQWyJrewqqE0Tk7TR35KsNYshZq5YvHSH6YzoU/lQ2pB6znpVbhMMVPm7DaKd8xr9rT2fvhiZwBaV/472BMTeM=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR08MB6763

Not all variants of the Rockchip CIF feature a scaler unit. Add
variant specific Boolean variable to account for this.

Signed-off-by: Michael Riesch <michael.riesch@wolfvision.net>
---
 drivers/media/platform/rockchip/cif/cif-capture.c | 8 +++++---
 drivers/media/platform/rockchip/cif/cif-common.h  | 1 +
 drivers/media/platform/rockchip/cif/cif-dev.c     | 1 +
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/drivers/media/platform/rockchip/cif/cif-capture.c b/drivers/media/platform/rockchip/cif/cif-capture.c
index b26e6023c2b0..dd5c45f28cdd 100644
--- a/drivers/media/platform/rockchip/cif/cif-capture.c
+++ b/drivers/media/platform/rockchip/cif/cif-capture.c
@@ -365,9 +365,11 @@ static int cif_stream_start(struct cif_stream *stream)
 
 	cif_write(cif_dev, CIF_FRAME_STATUS, CIF_FRAME_STAT_CLS);
 	cif_write(cif_dev, CIF_INTSTAT, CIF_INTSTAT_CLS);
-	cif_write(cif_dev, CIF_SCL_CTRL, (fmt_type == CIF_FMT_TYPE_YUV) ?
-					 CIF_SCL_CTRL_ENABLE_YUV_16BIT_BYPASS :
-					 CIF_SCL_CTRL_ENABLE_RAW_16BIT_BYPASS);
+	if (cif_dev->match_data->has_scaler)
+		cif_write(cif_dev, CIF_SCL_CTRL,
+			  (fmt_type == CIF_FMT_TYPE_YUV) ?
+				  CIF_SCL_CTRL_ENABLE_YUV_16BIT_BYPASS :
+				  CIF_SCL_CTRL_ENABLE_RAW_16BIT_BYPASS);
 
 	ret = cif_init_buffers(stream);
 	if (ret)
diff --git a/drivers/media/platform/rockchip/cif/cif-common.h b/drivers/media/platform/rockchip/cif/cif-common.h
index 84a7545422e1..e5500705eee2 100644
--- a/drivers/media/platform/rockchip/cif/cif-common.h
+++ b/drivers/media/platform/rockchip/cif/cif-common.h
@@ -100,6 +100,7 @@ struct cif_match_data {
 	const struct cif_input_fmt *in_fmts;
 	int in_fmts_num;
 	void (*grf_dvp_setup)(struct cif_device *cif_dev);
+	bool has_scaler;
 };
 
 struct cif_device {
diff --git a/drivers/media/platform/rockchip/cif/cif-dev.c b/drivers/media/platform/rockchip/cif/cif-dev.c
index fb80e8f8dcab..e7b5ae5804ca 100644
--- a/drivers/media/platform/rockchip/cif/cif-dev.c
+++ b/drivers/media/platform/rockchip/cif/cif-dev.c
@@ -282,6 +282,7 @@ static const struct cif_match_data px30_cif_match_data = {
 	.clks_num = ARRAY_SIZE(px30_cif_clks),
 	.in_fmts = px30_in_fmts,
 	.in_fmts_num = ARRAY_SIZE(px30_in_fmts),
+	.has_scaler = true,
 };
 
 static const struct of_device_id cif_plat_of_match[] = {

-- 
2.30.2