From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id F1686CAC592 for ; Fri, 19 Sep 2025 07:51:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:MIME-Version: Content-Transfer-Encoding:Content-Type:In-Reply-To:From:References:Cc:To: Subject:Date:Message-ID:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=OLSTpPhkM16PTQ09x3MFSxhwoJ0wBZpbS8eZRQUCfs0=; b=sXX2Pwifnjo4NJrElfexfawrwL M/CCbbOYwBS3kULRTFPMkW6y/9wE4XfwRlX1xA8W6fJSotuBqePaJyW+R1qUM1K4NO3mXEucYCWlE scLDu7nahDE+FTW04EU9WnH/T1DWxbm1cZAAAHktSra8bNwpseSpE+kHv0eapsINZs5DaG5pNLzet dJt974BYshlRTu3TKxkc3RP1whvIe+zvJxyhDr+AREbGUEUHSBSIB8JH3q6t7CbAeOPy3hvhRfntC seoF6hBg3yjgse0POvwg+7Rzc0FALY8S08caYE5XM/VzZ7o5mZZKwr+iSE2sc0igV19bw20/wBTfr gBz+bJ2A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1uzVu8-000000028tK-49a2; Fri, 19 Sep 2025 07:51:41 +0000 Received: from mail-swedencentralazlp170130007.outbound.protection.outlook.com ([2a01:111:f403:c202::7] helo=GVXPR05CU001.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1uzVu7-000000028sM-0XX5; Fri, 19 Sep 2025 07:51:40 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=MhwxtRtBBtkuPN1XSTzt9d1yjdVRlL+VDRZC480BUQqgO2DQtFyc8kJoaTk/5MzcDUrNJxfzbYu0jXIWJaK2Ab4WHK02D4zhwDbrTDx71nfwAplQ01Z8NXMXYVjPuhjAN1rS4MUXLyNxMWwUlaSkIdCy4eedLxeu8MhamM4DkdJ7Js1yvCYsJ9DYIQJbRk3X5bWECelS9u3Taq4o6qEMKId3SptIjeaZDRHE7rVfCvvOEb+m8ZWwxmxDu4Ck1+WE/LJaDGaRga/cnUJ51th/iqOnVFgA23JOFHmOfjr3PiSjnaRJyLOjEcnfSRy1WUFtylG44hwu1yncP1AT3xML+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=OLSTpPhkM16PTQ09x3MFSxhwoJ0wBZpbS8eZRQUCfs0=; b=dbunSWI7xTH66tGKKWONZXFBoaOkEGesAR3roU9wOx3gjM9sWt3S7JxyRVb9mTcKeR/pqFUNl1KFpO9AmdixcxA7vlv4Y1lqe2AcitRBiD2B9Iu3inkhYXglF0dKbeTBjf7w+01K7EdJDhxUiSTlN+TXHC01CKvPq3ozsVZGkxc45ws7CnuNLCJ9VZ1Iw97T71pF2jhVGfoIwoCR5uN1ktgPvAWQRvARDli6soX6QpenjbWL3lcl4LBV0yW3aTRL4J3W8SZlo+3IxeA/XI1XlI8FzQ7NKa2Y34Gg5rbYncQha569d5MRrwH+eBT1tUVwwYsqr/oygISNhgCIC9MzDw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=wolfvision.net; dmarc=pass action=none header.from=wolfvision.net; dkim=pass header.d=wolfvision.net; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wolfvision.net; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=OLSTpPhkM16PTQ09x3MFSxhwoJ0wBZpbS8eZRQUCfs0=; b=DL+l056WohED2G7I/G+CqfCNQ0d45wvC/aI6Khb6U/BSFByTRNqoL0r5rRH0RH4NaIj+0TdqEnPIvT82QlVilEgOatkruv+JgXNoTK1/wSiMDlYDDHfhXUJPF7oWcpJc0Dti69bn0vp4IOsW0+qHaCxDcspd4mM1Q4AiUYnVDsc= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=wolfvision.net; Received: from AS4PR08MB7735.eurprd08.prod.outlook.com (2603:10a6:20b:512::15) by PAWPR08MB9029.eurprd08.prod.outlook.com (2603:10a6:102:341::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9137.14; Fri, 19 Sep 2025 07:51:31 +0000 Received: from AS4PR08MB7735.eurprd08.prod.outlook.com ([fe80::dc8:5e03:5b06:8726]) by AS4PR08MB7735.eurprd08.prod.outlook.com ([fe80::dc8:5e03:5b06:8726%4]) with mapi id 15.20.9115.018; Fri, 19 Sep 2025 07:51:31 +0000 Message-ID: <14bfe4b8-f482-427c-83c1-d933376f10e1@wolfvision.net> Date: Fri, 19 Sep 2025 09:51:29 +0200 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v11 10/17] media: rockchip: rkcif: add support for px30 vip dvp capture To: michael.riesch@collabora.com, Mehdi Djait , Maxime Chevallier , =?UTF-8?Q?Th=C3=A9o_Lebrun?= , Thomas Petazzoni , Bryan O'Donoghue , Markus Elfring , Laurent Pinchart , Mauro Carvalho Chehab , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner , Kever Yang , Nicolas Dufresne , Sebastian Reichel , Collabora Kernel Team , Paul Kocialkowski , Alexander Shiyan , Val Packett , Rob Herring , Philipp Zabel , Sakari Ailus 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 References: <20240220-rk3568-vicap-v11-0-af0eada54e5d@collabora.com> <20240220-rk3568-vicap-v11-10-af0eada54e5d@collabora.com> From: Gerald Loacker Organization: WolfVision GmbH In-Reply-To: <20240220-rk3568-vicap-v11-10-af0eada54e5d@collabora.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-ClientProxiedBy: VI1P195CA0053.EURP195.PROD.OUTLOOK.COM (2603:10a6:802:5a::42) To AS4PR08MB7735.eurprd08.prod.outlook.com (2603:10a6:20b:512::15) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS4PR08MB7735:EE_|PAWPR08MB9029:EE_ X-MS-Office365-Filtering-Correlation-Id: 87e1251d-3488-448c-8b18-08ddf75158d0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|7416014|1800799024|366016|921020|7053199007; X-Microsoft-Antispam-Message-Info: =?utf-8?B?cVNiOG5DNFRESnhLS1dhRDdQeit5eU1NellvY0ZKOWxXVlVXeXl2dU9LNEVV?= =?utf-8?B?anhvb0todzc2Y01DVFdud1puUnhnVmM2TCt0T0hLRzBSZ2t5MUg0NDRlZzFC?= =?utf-8?B?TDJjUVRVeENOSERGUzZvcW0rZkZkWGFnZlMveXdDL0pKdjJuUmpydW5xNEZN?= =?utf-8?B?UlNiTHV6ejFMMExDZ1pRanFDYms2dVBFTWlmNmJZYUR4bkZyeXZ3eWxDemJS?= =?utf-8?B?RkRObEEvZ2NEc2pkd3B6T1paMVhjek9PR3Y1MWxKQ3I2MnhYR25QckpXcExa?= =?utf-8?B?N1ZVU2VEbVNOcWhxUTVic2h6V2hFWWZCdzkrdU04alJMcWJLREgydkRXOWIz?= =?utf-8?B?Z2lFem9EZ3JOVkg1a0FPMlgxdGRoZ3QzdUdyZzUzN0x2UWp0bm1GV21CS1c1?= =?utf-8?B?dkMzV3dwZWdFMlZrNVVtZFpTMmdlZm1CZGJhbXdHQ3phSUJrZ3F4TXlNQ2dM?= =?utf-8?B?dTJpcVh5cEF1czNkbEx1UVM2SFE3aExld1h4K2N1T3hhNXlzZ3U2NzBXUmMw?= =?utf-8?B?d3B0bWpOL1YrU2YxMUZqaFhPOUtPWldXUTFwWXZaS29kamNLOG1YOEcyRDZS?= =?utf-8?B?NTJxNVFlWmQ4b0tKZEltaENRQlZmRTBvcDRiT3Q2NTVnRFArVGQxUWc0Z0pH?= =?utf-8?B?SVNkY3FqSTR0WldVNmZLR0I4ZFBDYkorTlM0RGJOWDFKaWxtZkZaenp1UXk2?= =?utf-8?B?UU81ZG92dFUxbzhqNWpxRXlRam5pdW1saVJvY1JGei9Ud1hBTnVVY0o4TVRV?= =?utf-8?B?NndtNEpyRkcwOTduTndLMG5mUTFrR1dLQVo2cnErZWdkdHpIUkg0NWI5Q3kv?= =?utf-8?B?emhiZzdtdFdlU29SNXVPTy90cE9VTENRNEpjVWVWdU9iZFhPS0FrY254M1pT?= =?utf-8?B?blhoMzVibjZyYkExSUNGbTZiK0Fpb0lwNnVYZkNwV0hMTUVFVDlkTHp5OEtr?= =?utf-8?B?aEJWVXdhZjlpNW5MMVVibGhWclFUNHFJSDMyVUdyeHFYUENCR1NYdWFsR3Ni?= =?utf-8?B?OXJvazJydTlWcW1tYVNVTTR5d0R3bnFGelhCV1N0a2VrUmJ5cFNUNC9reGUv?= =?utf-8?B?dDkrZnN5Ymx1akRPOUJaZTJlRmRtcGdYNmFzLzZiRmZKMzdmcHBPVWRKNWY2?= =?utf-8?B?NFJWaHFWUWJKSUxURER4QXp1Q01rckxEdTNHMGVUU0xZMmpXWXBFcWZIVE9k?= =?utf-8?B?TFpGb2VXR01oY09NMW1qMWVwOThjNVZweTI1cUtHSkpVS0lCQThlcU9nNEJy?= =?utf-8?B?dDc3NlpQdUlCVEhYb01mT0NZa29XK1E2b0JSeUZFRXdsVVgySGFPeWJ2WFFR?= =?utf-8?B?WFlDUjlSc2Q3cFROWmtqK2tSSkhPTXk1bVFMNlMvSHUrRVFsTjRDV3o0a2Vh?= =?utf-8?B?MWI0MHRvQlcvY29RcUFWYkt4dG52Vm14RkVyVDRDOHhCNXpnSldsVnViWElO?= =?utf-8?B?NDBvT3Q2dG81SDBMeTFzNUlGak14TnQ3RVArZTlxV3ZLTVRUNEhTeXQxbDEx?= =?utf-8?B?N0dNZGNkazVmTWNCdGtYb1B5OEswNXZSMmdzREZvWEx4SVhxWlIydnBFMDZu?= =?utf-8?B?S2ZERnNldGZZREJsaE1aYkR2bU52WHhvZ3E5VjVoalZyZFF2aE1xUFlMUnpW?= =?utf-8?B?TktKL3ExNDFtSnhucjNvRVh5RmRZTndQamoyYklyT2tVZ25IdUpmQStZa3hX?= =?utf-8?B?eHFRazJyNjRrZTlTSXdJeHZ3WFFoU2NMRHF6S0xoYVdtZlh4U25tblk2Wkty?= =?utf-8?B?azA2QlBRekZhK1pjdmEvcHpxdlNCamdFR2tJNzZZNkRGL05YZXN4bHVNMkF2?= =?utf-8?B?a1RPbkpOdTYwK09UWlpMSXdNeVdpa0VCVVJEckxJUmlvQnRSbjJ6U0VtQS9Y?= =?utf-8?B?TnJPS0s3Y2hWUmVTVVNEL1BuSkxBcldMZUJUSlk4YlBOSGVEaHk4Snc3REpw?= =?utf-8?B?UFFGSWxjNkM1TDU5QjNBMHRlbkZLRmNpWjVEdVRyczhRb2RWdEhYM1huUVdr?= =?utf-8?B?cVNMU3dkcllBPT0=?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AS4PR08MB7735.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(7416014)(1800799024)(366016)(921020)(7053199007);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?ZGg5clROQzdRT2Q3ZS9CZDI4VkNadmV3RGJoOWtmUWllbTk4bzMxYnRYUkd5?= =?utf-8?B?ZGNhVGx1d25jN2wvTnN0NFh6R3lBYTZwU2RjaXFXRWRKWDYwVlNhQUl3azZ2?= =?utf-8?B?NTdMc0lLZEo5UXhJUHdsd0VzWDA2NzY3RTNGbHJLWVlNTlQyOVU5M2RRREJ2?= =?utf-8?B?ZW1qYkFaU09MVDcrQU9PMjBnb0FoTm5oQlVKVnhtdFh6cGNvRTc0M0luQ2Js?= =?utf-8?B?c0tENlR5cWx6c096cXhPWWg5bkhVZTZaL0Y3cHJGdDBWeWptZXZ1eFVDNlc4?= =?utf-8?B?azZqa0MyanNMcXRtY2thaGt0NUd4VWppNGhOUnFIT3BEZWRsalQ0ZUFlTGkr?= =?utf-8?B?MzJlajJMdHd6UUdWa05hREtGQ0pIaDVGVy9sRXZlNnNjV09ieEtrNU5qSFNB?= =?utf-8?B?R0habXhjWi95bGp3eE5nMzZXb2EvK0JRMjdqelpVdHNoOEhPWkRGNmh2dzYx?= =?utf-8?B?TDlqaGQvdTMrcmVxYVUrb3FMZ3U5eXlYUEp1SmRuNERKWWtDNjZ2QXk1SGRq?= =?utf-8?B?Y0RlMFpod2NhamlKZkphVmFKL0FUQ3dOYmRzb0NrblI2MjVpQmNoNTFwS0Ur?= =?utf-8?B?c0ZpTWpjZkhXU0F2ZjJNak50WXlrY1N0eUZIOFlxTlowdUFOcU00ZnVxU0tV?= =?utf-8?B?ZDhRWERaWEJaYWsvTzRudUdkVm84OG9VL1loTmYreFdSS09HRWhValg5WWFN?= =?utf-8?B?TUl3NjZNa3JJMkVYdXRlSDFDTE1RZ2xJVkF0bUZKRlQ3MlpncmNMUE1xWEVM?= =?utf-8?B?cTJ2R2JKR2ExL25JTXYxWGUyM0doWml3Um9ML2hzZUtHWjdyNS9RN0ZDTnp3?= =?utf-8?B?bG9XQ21tenFtMDFKVlU2SmlkUVovaWQ5SU1QWGZDSmcrNmtwZDduK25LSEhF?= =?utf-8?B?V2NCazVPNUN4cEM3dWRodGw0Mm5YeGxIV21MaXM5NXRJN3FhVkVQaVY5aWRn?= =?utf-8?B?SUUxV2c5bFFRcUhKdFdaS3BGbmxWcW1ONjF4OVd5UEQ3Vm40T05lcTZXUzRi?= =?utf-8?B?THdRZGxEQ3FRSU4yRUdFVmo0QnRZR2JuY2hCbWtOQU9EWnFCTC9kdWFvcFV6?= =?utf-8?B?M1hnWDBKUWxNcmJPMTN4TXVublZSVUFFQWZCM2x6RWdneDdabDRtZFFIVm5z?= =?utf-8?B?N3pGY2c1M3VQaHIyaXRhM1FiMzFqa3JFZWpaUXEreUx0R2tkTE44QnlvdWRJ?= =?utf-8?B?WFZSeTJKa1R4b0pJZ0puWVl5U3hFUWJlajk4Yk9tbExFQUxMTTYwOHIxUzl1?= =?utf-8?B?WTF2WXN6SGhkRkJqUjB4OWRyMUMyNktmeXpFKzhPdFhNUGlXMVBJLzZ2QVdD?= =?utf-8?B?Ti9mNXFlSnNTdk8zenZ2WWxUZ2QvWEpRZE5zTGpoUSt0UGI1OGRvM09QM3FD?= =?utf-8?B?U1ZqWm5xTDNubzh4V3NZTVEwdGRXVi9lZ0lxZjFLK2VMS3dYSEN2MXROTFEv?= =?utf-8?B?dEdsUko1RndmVzhrendLTEd2SlQxcmw5V3VoSDlTd0RBN3VtS2o5YU1LMjh5?= =?utf-8?B?VTFuYTVnOHNIejducnZkbkM3WWd1ZkZJb004Z2VuNlZtZEVodUhydFQ3U1Q5?= =?utf-8?B?eGQzQlV5TUtMcDF3QUR6Ulh5dFlhNmF0VDRnekEwYm96NDdYdktOWlpvOU5Y?= =?utf-8?B?bzFHT1hKWG55Si9YWXZBaGd4NTJwNTFzVDI1Z1FoVXQ5MkRWazBCanZmVjlu?= =?utf-8?B?d2dKdEE2ajc5T0FWdVdySXJmbEIyeHluSmczeXFSdnp3bFVzcE1jVGozdWJn?= =?utf-8?B?Vm9VTXVHTG1pNXY1MTV5c0d4V21zL3FucFRNNCtYSGYxNFcrOEJmbWk1NnFT?= =?utf-8?B?S2pTQkNEcStVdWovUTRhTEQ3ZjRkanBQeHZweWFSU005eUh2QXBnRXlRREhQ?= =?utf-8?B?QnJHakxqcnE2eVRCZloyVzh0UTUxb01rSVR0NUtpcm4rRVJrZUFRbU5Uek85?= =?utf-8?B?eG1CWkUwbUkwZkdzZ1RqZ2g0Q0VtVU80N05TV04xb09YbTk3c3N4VEZzVFBy?= =?utf-8?B?MERtVEhBenNnZkRIVlNLY0RUcU9yd2p6Z05ZQ2FJSFBmQ20rdEN1Z1UxQzdK?= =?utf-8?B?NEZ6WmNRS1hCQmdEYXB0OHFRZFIvMTk2bnZJZk1EN1BFUWJEWDJkaTYwU0VX?= =?utf-8?B?OHowRzB3bGNxeHlya0l6M0pybXIxN3NRUmxTT3lvY3VtU0JuSXRqN1ltbTVV?= =?utf-8?B?MEE9PQ==?= X-OriginatorOrg: wolfvision.net X-MS-Exchange-CrossTenant-Network-Message-Id: 87e1251d-3488-448c-8b18-08ddf75158d0 X-MS-Exchange-CrossTenant-AuthSource: AS4PR08MB7735.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Sep 2025 07:51:31.2511 (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: oKh5A8+9YTPozESU9ZwtDiim8cxCoHJlQGoayU69SUxd9TfqzWRMxdd/gCxofbg8dyZMsbT26qXE8lmmIlqBqVI1Fef779r4JstHwV7U9Ck= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAWPR08MB9029 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250919_005139_358714_F067AB64 X-CRM114-Status: GOOD ( 17.77 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi Michael, Am 17.09.2025 um 17:38 schrieb Michael Riesch via B4 Relay: > From: Michael Riesch > > The PX30 Video Input Processor (VIP) unit features a Digital Video > Port (DVP). Add support for the DVP in general and for the PX30 > VIP DVP in particular. > > Signed-off-by: Michael Riesch > --- > drivers/media/platform/rockchip/rkcif/Makefile | 1 + > .../platform/rockchip/rkcif/rkcif-capture-dvp.c | 588 +++++++++++++++++++++ > .../platform/rockchip/rkcif/rkcif-capture-dvp.h | 23 + > .../media/platform/rockchip/rkcif/rkcif-common.h | 28 + > drivers/media/platform/rockchip/rkcif/rkcif-dev.c | 15 + > drivers/media/platform/rockchip/rkcif/rkcif-regs.h | 131 +++++ > 6 files changed, 786 insertions(+) > > diff --git a/drivers/media/platform/rockchip/rkcif/Makefile b/drivers/media/platform/rockchip/rkcif/Makefile > index 256335d95050..a36e294d569d 100644 > --- a/drivers/media/platform/rockchip/rkcif/Makefile > +++ b/drivers/media/platform/rockchip/rkcif/Makefile > @@ -1,6 +1,7 @@ > # SPDX-License-Identifier: GPL-2.0 > obj-$(CONFIG_VIDEO_ROCKCHIP_CIF) += rockchip-cif.o > > +rockchip-cif-objs += rkcif-capture-dvp.o > rockchip-cif-objs += rkcif-dev.o > rockchip-cif-objs += rkcif-interface.o > rockchip-cif-objs += rkcif-stream.o > diff --git a/drivers/media/platform/rockchip/rkcif/rkcif-capture-dvp.c b/drivers/media/platform/rockchip/rkcif/rkcif-capture-dvp.c > new file mode 100644 > index 000000000000..35e2b685a4d8 > --- /dev/null > +++ b/drivers/media/platform/rockchip/rkcif/rkcif-capture-dvp.c > @@ -0,0 +1,588 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * Rockchip Camera Interface (CIF) Driver > + * > + * Copyright (C) 2018 Rockchip Electronics Co., Ltd. > + * Copyright (C) 2020 Maxime Chevallier > + * Copyright (C) 2023 Mehdi Djait > + * Copyright (C) 2025 Michael Riesch > + */ > + > +#include > +#include > +#include > +#include > + > +#include "rkcif-capture-dvp.h" > +#include "rkcif-common.h" > +#include "rkcif-interface.h" > +#include "rkcif-regs.h" > +#include "rkcif-stream.h" > + > +static const struct rkcif_output_fmt dvp_out_fmts[] = { > + { > + .fourcc = V4L2_PIX_FMT_NV16, > + .dvp_fmt_val = RKCIF_FORMAT_YUV_OUTPUT_422 | > + RKCIF_FORMAT_UV_STORAGE_ORDER_UVUV, > + .cplanes = 2, > + }, > + { > + .fourcc = V4L2_PIX_FMT_NV16M, > + .dvp_fmt_val = RKCIF_FORMAT_YUV_OUTPUT_422 | > + RKCIF_FORMAT_UV_STORAGE_ORDER_UVUV, > + .cplanes = 2, > + }, > + { > + .fourcc = V4L2_PIX_FMT_NV61, > + .dvp_fmt_val = RKCIF_FORMAT_YUV_OUTPUT_422 | > + RKCIF_FORMAT_UV_STORAGE_ORDER_VUVU, > + .cplanes = 2, > + }, > + { > + .fourcc = V4L2_PIX_FMT_NV61M, > + .dvp_fmt_val = RKCIF_FORMAT_YUV_OUTPUT_422 | > + RKCIF_FORMAT_UV_STORAGE_ORDER_VUVU, > + .cplanes = 2, > + }, > + { > + .fourcc = V4L2_PIX_FMT_NV12, > + .dvp_fmt_val = RKCIF_FORMAT_YUV_OUTPUT_420 | > + RKCIF_FORMAT_UV_STORAGE_ORDER_UVUV, > + .cplanes = 2, > + }, > + { > + .fourcc = V4L2_PIX_FMT_NV12M, > + .dvp_fmt_val = RKCIF_FORMAT_YUV_OUTPUT_420 | > + RKCIF_FORMAT_UV_STORAGE_ORDER_UVUV, > + .cplanes = 2, > + }, > + { > + .fourcc = V4L2_PIX_FMT_NV21, > + .dvp_fmt_val = RKCIF_FORMAT_YUV_OUTPUT_420 | > + RKCIF_FORMAT_UV_STORAGE_ORDER_VUVU, > + .cplanes = 2, > + }, > + { > + .fourcc = V4L2_PIX_FMT_NV21M, > + .dvp_fmt_val = RKCIF_FORMAT_YUV_OUTPUT_420 | > + RKCIF_FORMAT_UV_STORAGE_ORDER_VUVU, > + .cplanes = 2, > + }, > + { > + .fourcc = V4L2_PIX_FMT_RGB24, > + .cplanes = 1, > + }, > + { > + .fourcc = V4L2_PIX_FMT_RGB565, > + .cplanes = 1, > + }, > + { > + .fourcc = V4L2_PIX_FMT_BGR666, > + .cplanes = 1, > + }, > + { > + .fourcc = V4L2_PIX_FMT_SRGGB8, > + .cplanes = 1, > + }, > + { > + .fourcc = V4L2_PIX_FMT_SGRBG8, > + .cplanes = 1, > + }, > + { > + .fourcc = V4L2_PIX_FMT_SGBRG8, > + .cplanes = 1, > + }, > + { > + .fourcc = V4L2_PIX_FMT_SBGGR8, > + .cplanes = 1, > + }, > + { > + .fourcc = V4L2_PIX_FMT_SRGGB10, > + .cplanes = 1, > + }, > + { > + .fourcc = V4L2_PIX_FMT_SGRBG10, > + .cplanes = 1, > + }, > + { > + .fourcc = V4L2_PIX_FMT_SGBRG10, > + .cplanes = 1, > + }, > + { > + .fourcc = V4L2_PIX_FMT_SBGGR10, > + .cplanes = 1, > + }, > + { > + .fourcc = V4L2_PIX_FMT_SRGGB12, > + .cplanes = 1, > + }, > + { > + .fourcc = V4L2_PIX_FMT_SGRBG12, > + .cplanes = 1, > + }, > + { > + .fourcc = V4L2_PIX_FMT_SGBRG12, > + .cplanes = 1, > + }, > + { > + .fourcc = V4L2_PIX_FMT_SBGGR12, > + .cplanes = 1, > + }, > + { > + .fourcc = V4L2_PIX_FMT_SBGGR16, > + .cplanes = 1, > + }, > + { > + .fourcc = V4L2_PIX_FMT_Y16, > + .cplanes = 1, > + }, > +}; > + > +static const struct rkcif_input_fmt px30_dvp_in_fmts[] = { > + { > + .mbus_code = MEDIA_BUS_FMT_YUYV8_2X8, > + .dvp_fmt_val = RKCIF_FORMAT_YUV_INPUT_422 | > + RKCIF_FORMAT_YUV_INPUT_ORDER_YUYV, > + .fmt_type = RKCIF_FMT_TYPE_YUV, > + .field = V4L2_FIELD_NONE, > + }, > + { > + .mbus_code = MEDIA_BUS_FMT_YUYV8_2X8, > + .dvp_fmt_val = RKCIF_FORMAT_YUV_INPUT_422 | > + RKCIF_FORMAT_YUV_INPUT_ORDER_YUYV, > + .fmt_type = RKCIF_FMT_TYPE_YUV, > + .field = V4L2_FIELD_INTERLACED, > + }, > + { > + .mbus_code = MEDIA_BUS_FMT_YVYU8_2X8, > + .dvp_fmt_val = RKCIF_FORMAT_YUV_INPUT_422 | > + RKCIF_FORMAT_YUV_INPUT_ORDER_YVYU, > + .fmt_type = RKCIF_FMT_TYPE_YUV, > + .field = V4L2_FIELD_NONE, > + }, > + { > + .mbus_code = MEDIA_BUS_FMT_YVYU8_2X8, > + .dvp_fmt_val = RKCIF_FORMAT_YUV_INPUT_422 | > + RKCIF_FORMAT_YUV_INPUT_ORDER_YVYU, > + .fmt_type = RKCIF_FMT_TYPE_YUV, > + .field = V4L2_FIELD_INTERLACED, > + }, > + { > + .mbus_code = MEDIA_BUS_FMT_UYVY8_2X8, > + .dvp_fmt_val = RKCIF_FORMAT_YUV_INPUT_422 | > + RKCIF_FORMAT_YUV_INPUT_ORDER_UYVY, > + .fmt_type = RKCIF_FMT_TYPE_YUV, > + .field = V4L2_FIELD_NONE, > + }, > + { > + .mbus_code = MEDIA_BUS_FMT_UYVY8_2X8, > + .dvp_fmt_val = RKCIF_FORMAT_YUV_INPUT_422 | > + RKCIF_FORMAT_YUV_INPUT_ORDER_UYVY, > + .fmt_type = RKCIF_FMT_TYPE_YUV, > + .field = V4L2_FIELD_INTERLACED, > + }, > + { > + .mbus_code = MEDIA_BUS_FMT_VYUY8_2X8, > + .dvp_fmt_val = RKCIF_FORMAT_YUV_INPUT_422 | > + RKCIF_FORMAT_YUV_INPUT_ORDER_VYUY, > + .fmt_type = RKCIF_FMT_TYPE_YUV, > + .field = V4L2_FIELD_NONE, > + }, > + { > + .mbus_code = MEDIA_BUS_FMT_VYUY8_2X8, > + .dvp_fmt_val = RKCIF_FORMAT_YUV_INPUT_422 | > + RKCIF_FORMAT_YUV_INPUT_ORDER_VYUY, > + .fmt_type = RKCIF_FMT_TYPE_YUV, > + .field = V4L2_FIELD_INTERLACED, > + }, > + { > + .mbus_code = MEDIA_BUS_FMT_SBGGR8_1X8, > + .dvp_fmt_val = RKCIF_FORMAT_INPUT_MODE_RAW | > + RKCIF_FORMAT_RAW_DATA_WIDTH_8, > + .fmt_type = RKCIF_FMT_TYPE_RAW, > + .field = V4L2_FIELD_NONE, > + }, > + { > + .mbus_code = MEDIA_BUS_FMT_SGBRG8_1X8, > + .dvp_fmt_val = RKCIF_FORMAT_INPUT_MODE_RAW | > + RKCIF_FORMAT_RAW_DATA_WIDTH_8, > + .fmt_type = RKCIF_FMT_TYPE_RAW, > + .field = V4L2_FIELD_NONE, > + }, > + { > + .mbus_code = MEDIA_BUS_FMT_SGRBG8_1X8, > + .dvp_fmt_val = RKCIF_FORMAT_INPUT_MODE_RAW | > + RKCIF_FORMAT_RAW_DATA_WIDTH_8, > + .fmt_type = RKCIF_FMT_TYPE_RAW, > + .field = V4L2_FIELD_NONE, > + }, > + { > + .mbus_code = MEDIA_BUS_FMT_SRGGB8_1X8, > + .dvp_fmt_val = RKCIF_FORMAT_INPUT_MODE_RAW | > + RKCIF_FORMAT_RAW_DATA_WIDTH_8, > + .fmt_type = RKCIF_FMT_TYPE_RAW, > + .field = V4L2_FIELD_NONE, > + }, > + { > + .mbus_code = MEDIA_BUS_FMT_SBGGR10_1X10, > + .dvp_fmt_val = RKCIF_FORMAT_INPUT_MODE_RAW | > + RKCIF_FORMAT_RAW_DATA_WIDTH_10, > + .fmt_type = RKCIF_FMT_TYPE_RAW, > + .field = V4L2_FIELD_NONE, > + }, > + { > + .mbus_code = MEDIA_BUS_FMT_SGBRG10_1X10, > + .dvp_fmt_val = RKCIF_FORMAT_INPUT_MODE_RAW | > + RKCIF_FORMAT_RAW_DATA_WIDTH_10, > + .fmt_type = RKCIF_FMT_TYPE_RAW, > + .field = V4L2_FIELD_NONE, > + }, > + { > + .mbus_code = MEDIA_BUS_FMT_SGRBG10_1X10, > + .dvp_fmt_val = RKCIF_FORMAT_INPUT_MODE_RAW | > + RKCIF_FORMAT_RAW_DATA_WIDTH_10, > + .fmt_type = RKCIF_FMT_TYPE_RAW, > + .field = V4L2_FIELD_NONE, > + }, > + { > + .mbus_code = MEDIA_BUS_FMT_SRGGB10_1X10, > + .dvp_fmt_val = RKCIF_FORMAT_INPUT_MODE_RAW | > + RKCIF_FORMAT_RAW_DATA_WIDTH_10, > + .fmt_type = RKCIF_FMT_TYPE_RAW, > + .field = V4L2_FIELD_NONE, > + }, > + { > + .mbus_code = MEDIA_BUS_FMT_SBGGR12_1X12, > + .dvp_fmt_val = RKCIF_FORMAT_INPUT_MODE_RAW | > + RKCIF_FORMAT_RAW_DATA_WIDTH_12, > + .fmt_type = RKCIF_FMT_TYPE_RAW, > + .field = V4L2_FIELD_NONE, > + }, > + { > + .mbus_code = MEDIA_BUS_FMT_SGBRG12_1X12, > + .dvp_fmt_val = RKCIF_FORMAT_INPUT_MODE_RAW | > + RKCIF_FORMAT_RAW_DATA_WIDTH_12, > + .fmt_type = RKCIF_FMT_TYPE_RAW, > + .field = V4L2_FIELD_NONE, > + }, > + { > + .mbus_code = MEDIA_BUS_FMT_SGRBG12_1X12, > + .dvp_fmt_val = RKCIF_FORMAT_INPUT_MODE_RAW | > + RKCIF_FORMAT_RAW_DATA_WIDTH_12, > + .fmt_type = RKCIF_FMT_TYPE_RAW, > + .field = V4L2_FIELD_NONE, > + }, > + { > + .mbus_code = MEDIA_BUS_FMT_SRGGB12_1X12, > + .dvp_fmt_val = RKCIF_FORMAT_INPUT_MODE_RAW | > + RKCIF_FORMAT_RAW_DATA_WIDTH_12, > + .fmt_type = RKCIF_FMT_TYPE_RAW, > + .field = V4L2_FIELD_NONE, > + }, > + { > + .mbus_code = MEDIA_BUS_FMT_RGB888_1X24, > + .field = V4L2_FIELD_NONE, > + }, > + { > + .mbus_code = MEDIA_BUS_FMT_Y8_1X8, > + .dvp_fmt_val = RKCIF_FORMAT_INPUT_MODE_RAW | > + RKCIF_FORMAT_RAW_DATA_WIDTH_8, > + .fmt_type = RKCIF_FMT_TYPE_RAW, > + .field = V4L2_FIELD_NONE, > + }, > + { > + .mbus_code = MEDIA_BUS_FMT_Y10_1X10, > + .dvp_fmt_val = RKCIF_FORMAT_INPUT_MODE_RAW | > + RKCIF_FORMAT_RAW_DATA_WIDTH_10, > + .fmt_type = RKCIF_FMT_TYPE_RAW, > + .field = V4L2_FIELD_NONE, > + }, > + { > + .mbus_code = MEDIA_BUS_FMT_Y12_1X12, > + .dvp_fmt_val = RKCIF_FORMAT_INPUT_MODE_RAW | > + RKCIF_FORMAT_RAW_DATA_WIDTH_12, > + .fmt_type = RKCIF_FMT_TYPE_RAW, > + .field = V4L2_FIELD_NONE, > + } > +}; > + > +const struct rkcif_dvp_match_data rkcif_px30_vip_dvp_match_data = { > + .in_fmts = px30_dvp_in_fmts, > + .in_fmts_num = ARRAY_SIZE(px30_dvp_in_fmts), > + .out_fmts = dvp_out_fmts, > + .out_fmts_num = ARRAY_SIZE(dvp_out_fmts), > + .has_scaler = true, > + .regs = { > + [RKCIF_DVP_CTRL] = 0x00, > + [RKCIF_DVP_INTEN] = 0x04, > + [RKCIF_DVP_INTSTAT] = 0x08, > + [RKCIF_DVP_FOR] = 0x0c, > + [RKCIF_DVP_LINE_NUM_ADDR] = 0x10, > + [RKCIF_DVP_FRM0_ADDR_Y] = 0x14, > + [RKCIF_DVP_FRM0_ADDR_UV] = 0x18, > + [RKCIF_DVP_FRM1_ADDR_Y] = 0x1c, > + [RKCIF_DVP_FRM1_ADDR_UV] = 0x20, > + [RKCIF_DVP_VIR_LINE_WIDTH] = 0x24, > + [RKCIF_DVP_SET_SIZE] = 0x28, > + [RKCIF_DVP_SCL_CTRL] = 0x48, > + [RKCIF_DVP_FRAME_STATUS] = 0x60, > + [RKCIF_DVP_LAST_LINE] = 0x68, > + [RKCIF_DVP_LAST_PIX] = 0x6c, > + }, > +}; > + > +static inline unsigned int rkcif_dvp_get_addr(struct rkcif_device *rkcif, > + unsigned int index) > +{ > + if (WARN_ON_ONCE(index >= RKCIF_DVP_REGISTER_MAX)) > + return RKCIF_REGISTER_NOTSUPPORTED; > + > + return rkcif->match_data->dvp->regs[index]; > +} > + > +static inline __maybe_unused void rkcif_dvp_write(struct rkcif_device *rkcif, > + unsigned int index, u32 val) > +{ > + unsigned int addr = rkcif_dvp_get_addr(rkcif, index); > + > + if (addr == RKCIF_REGISTER_NOTSUPPORTED) > + return; > + > + writel(val, rkcif->base_addr + addr); > +} > + > +static inline __maybe_unused u32 rkcif_dvp_read(struct rkcif_device *rkcif, > + unsigned int index) > +{ > + unsigned int addr = rkcif_dvp_get_addr(rkcif, index); > + > + if (addr == RKCIF_REGISTER_NOTSUPPORTED) > + return 0; > + > + return readl(rkcif->base_addr + addr); > +} > + > +static void rkcif_dvp_queue_buffer(struct rkcif_stream *stream, > + unsigned int index) > +{ > + struct rkcif_device *rkcif = stream->rkcif; > + struct rkcif_buffer *buffer = stream->buffers[index]; > + u32 frm_addr_y, frm_addr_uv; > + > + frm_addr_y = index ? RKCIF_DVP_FRM1_ADDR_Y : RKCIF_DVP_FRM0_ADDR_Y; > + frm_addr_uv = index ? RKCIF_DVP_FRM1_ADDR_UV : RKCIF_DVP_FRM0_ADDR_UV; > + > + rkcif_dvp_write(rkcif, frm_addr_y, buffer->buff_addr[RKCIF_PLANE_Y]); > + rkcif_dvp_write(rkcif, frm_addr_uv, buffer->buff_addr[RKCIF_PLANE_UV]); > +} > + > +static int rkcif_dvp_start_streaming(struct rkcif_stream *stream) > +{ > + struct rkcif_device *rkcif = stream->rkcif; > + struct rkcif_interface *interface = stream->interface; > + struct v4l2_mbus_config_parallel *parallel; > + struct v4l2_mbus_framefmt *source_fmt; > + struct v4l2_subdev_state *state; > + const struct rkcif_input_fmt *active_in_fmt; > + const struct rkcif_output_fmt *active_out_fmt; > + u32 val = 0; > + int ret = -EINVAL; > + > + state = v4l2_subdev_lock_and_get_active_state(&interface->sd); > + source_fmt = v4l2_subdev_state_get_format(state, RKCIF_IF_PAD_SRC, > + stream->id); > + if (!source_fmt) > + goto out; > + > + active_in_fmt = rkcif_interface_find_input_fmt(interface, false, > + source_fmt->code); > + active_out_fmt = rkcif_stream_find_output_fmt(stream, false, > + stream->pix.pixelformat); > + if (!active_in_fmt || !active_out_fmt) > + goto out; > + > + parallel = &interface->vep.bus.parallel; > + if (parallel->bus_width == 16 && > + (parallel->flags & V4L2_MBUS_PCLK_SAMPLE_DUALEDGE)) > + val |= RKCIF_FORMAT_BT1120_CLOCK_DOUBLE_EDGES; > + val |= active_in_fmt->dvp_fmt_val; > + val |= active_out_fmt->dvp_fmt_val; > + rkcif_dvp_write(rkcif, RKCIF_DVP_FOR, val); > + > + val = stream->pix.width; > + if (active_in_fmt->fmt_type == RKCIF_FMT_TYPE_RAW) > + val = stream->pix.width * 2; > + rkcif_dvp_write(rkcif, RKCIF_DVP_VIR_LINE_WIDTH, val); > + > + val = RKCIF_XY_COORD(stream->pix.width, stream->pix.height); > + rkcif_dvp_write(rkcif, RKCIF_DVP_SET_SIZE, val); > + > + rkcif_dvp_write(rkcif, RKCIF_DVP_FRAME_STATUS, RKCIF_FRAME_STAT_CLS); > + rkcif_dvp_write(rkcif, RKCIF_DVP_INTSTAT, RKCIF_INTSTAT_CLS); > + if (rkcif->match_data->dvp->has_scaler) { > + val = active_in_fmt->fmt_type == RKCIF_FMT_TYPE_YUV ? > + RKCIF_SCL_CTRL_ENABLE_YUV_16BIT_BYPASS : > + RKCIF_SCL_CTRL_ENABLE_RAW_16BIT_BYPASS; > + rkcif_dvp_write(rkcif, RKCIF_DVP_SCL_CTRL, val); > + } > + > + rkcif_dvp_write(rkcif, RKCIF_DVP_INTEN, > + RKCIF_INTEN_FRAME_END_EN | > + RKCIF_INTEN_PST_INF_FRAME_END_EN); > + > + rkcif_dvp_write(rkcif, RKCIF_DVP_CTRL, > + RKCIF_CTRL_AXI_BURST_16 | RKCIF_CTRL_MODE_PINGPONG | > + RKCIF_CTRL_ENABLE_CAPTURE); > + > + ret = 0; > + > +out: > + v4l2_subdev_unlock_state(state); > + return ret; > +} > + > +static void rkcif_dvp_stop_streaming(struct rkcif_stream *stream) > +{ > + struct rkcif_device *rkcif = stream->rkcif; > + u32 val; > + > + val = rkcif_dvp_read(rkcif, RKCIF_DVP_CTRL); > + rkcif_dvp_write(rkcif, RKCIF_DVP_CTRL, > + val & (~RKCIF_CTRL_ENABLE_CAPTURE)); > + rkcif_dvp_write(rkcif, RKCIF_DVP_INTEN, 0x0); > + rkcif_dvp_write(rkcif, RKCIF_DVP_INTSTAT, 0x3ff); > + rkcif_dvp_write(rkcif, RKCIF_DVP_FRAME_STATUS, 0x0); > + > + stream->stopping = false; > +} > + > +static void rkcif_dvp_reset_stream(struct rkcif_device *rkcif) > +{ > + u32 ctl = rkcif_dvp_read(rkcif, RKCIF_DVP_CTRL); > + > + rkcif_dvp_write(rkcif, RKCIF_DVP_CTRL, > + ctl & (~RKCIF_CTRL_ENABLE_CAPTURE)); > + rkcif_dvp_write(rkcif, RKCIF_DVP_CTRL, ctl | RKCIF_CTRL_ENABLE_CAPTURE); > +} > + > +static void rkcif_dvp_set_crop(struct rkcif_stream *stream, u16 left, u16 top) > +{ > + struct rkcif_device *rkcif = stream->rkcif; > + u32 val; > + > + val = RKCIF_XY_COORD(left, top); > + rkcif_dvp_write(rkcif, RKCIF_DVP_CROP, val); > +} > + > +irqreturn_t rkcif_dvp_isr(int irq, void *ctx) > +{ > + struct device *dev = ctx; > + struct rkcif_device *rkcif = dev_get_drvdata(dev); > + struct rkcif_stream *stream; > + u32 intstat, lastline, lastpix, cif_frmst; > + irqreturn_t ret = IRQ_NONE; > + > + if (!rkcif->match_data->dvp) > + return ret; > + > + intstat = rkcif_dvp_read(rkcif, RKCIF_DVP_INTSTAT); > + cif_frmst = rkcif_dvp_read(rkcif, RKCIF_DVP_FRAME_STATUS); > + lastline = RKCIF_FETCH_Y(rkcif_dvp_read(rkcif, RKCIF_DVP_LAST_LINE)); > + lastpix = RKCIF_FETCH_Y(rkcif_dvp_read(rkcif, RKCIF_DVP_LAST_PIX)); > + > + if (intstat & RKCIF_INTSTAT_FRAME_END) { > + rkcif_dvp_write(rkcif, RKCIF_DVP_INTSTAT, > + RKCIF_INTSTAT_FRAME_END_CLR | > + RKCIF_INTSTAT_LINE_END_CLR); > + > + stream = &rkcif->interfaces[RKCIF_DVP].streams[RKCIF_ID0]; > + > + if (stream->stopping) { > + rkcif_dvp_stop_streaming(stream); > + wake_up(&stream->wq_stopped); > + ret = IRQ_HANDLED; > + goto out; > + } > + > + if (lastline != stream->pix.height) { > + v4l2_err(&rkcif->v4l2_dev, > + "bad frame, irq:%#x frmst:%#x size:%dx%d\n", > + intstat, cif_frmst, lastpix, lastline); > + > + rkcif_dvp_reset_stream(rkcif); > + } > + > + rkcif_stream_pingpong(stream); > + > + ret = IRQ_HANDLED; > + } > +out: > + return ret; > +} > + > +int rkcif_dvp_register(struct rkcif_device *rkcif) > +{ > + struct rkcif_interface *interface; > + unsigned int streams_num; > + int ret; > + > + if (!rkcif->match_data->dvp) > + return 0; > + > + interface = &rkcif->interfaces[RKCIF_DVP]; > + interface->index = RKCIF_DVP; > + interface->type = RKCIF_IF_DVP; > + interface->in_fmts = rkcif->match_data->dvp->in_fmts; > + interface->in_fmts_num = rkcif->match_data->dvp->in_fmts_num; > + interface->set_crop = rkcif_dvp_set_crop; > + ret = rkcif_interface_register(rkcif, interface); > + if (ret) > + return ret; > + > + if (rkcif->match_data->dvp->setup) > + rkcif->match_data->dvp->setup(rkcif); > + > + streams_num = rkcif->match_data->dvp->has_ids ? 4 : 1; > + for (unsigned int i = 0; i < streams_num; i++) { > + struct rkcif_stream *stream = &interface->streams[i]; > + > + stream->id = i; > + stream->interface = interface; > + stream->out_fmts = rkcif->match_data->dvp->out_fmts; > + stream->out_fmts_num = rkcif->match_data->dvp->out_fmts_num; > + stream->queue_buffer = rkcif_dvp_queue_buffer; > + stream->start_streaming = rkcif_dvp_start_streaming; > + stream->stop_streaming = rkcif_dvp_stop_streaming; > + > + ret = rkcif_stream_register(rkcif, stream); > + if (ret) > + goto err_streams_unregister; > + > + interface->streams_num++; > + } > + > + return 0; > + > +err_streams_unregister: > + for (unsigned int i = 0; i < interface->streams_num; i++) > + rkcif_stream_unregister(&interface->streams[i]); > + > + rkcif_interface_unregister(interface); > + > + return ret; > +} > + > +void rkcif_dvp_unregister(struct rkcif_device *rkcif) > +{ > + struct rkcif_interface *interface; > + > + if (!rkcif->match_data->dvp) > + return; > + > + interface = &rkcif->interfaces[RKCIF_DVP]; > + > + for (unsigned int i = 0; i < interface->streams_num; i++) > + rkcif_stream_unregister(&interface->streams[i]); > + > + rkcif_interface_unregister(interface); > +} > diff --git a/drivers/media/platform/rockchip/rkcif/rkcif-capture-dvp.h b/drivers/media/platform/rockchip/rkcif/rkcif-capture-dvp.h > new file mode 100644 > index 000000000000..5c58088dd348 > --- /dev/null > +++ b/drivers/media/platform/rockchip/rkcif/rkcif-capture-dvp.h > @@ -0,0 +1,23 @@ > +/* SPDX-License-Identifier: GPL-2.0 */ > +/* > + * Rockchip Camera Interface (CIF) Driver > + * > + * Copyright (C) 2018 Rockchip Electronics Co., Ltd. > + * Copyright (C) 2023 Mehdi Djait > + * Copyright (C) 2025 Michael Riesch > + */ > + > +#ifndef _RKCIF_CAPTURE_DVP_H > +#define _RKCIF_CAPTURE_DVP_H > + > +#include "rkcif-common.h" > + > +extern const struct rkcif_dvp_match_data rkcif_px30_vip_dvp_match_data; > + > +int rkcif_dvp_register(struct rkcif_device *rkcif); > + > +void rkcif_dvp_unregister(struct rkcif_device *rkcif); > + > +irqreturn_t rkcif_dvp_isr(int irq, void *ctx); > + > +#endif > diff --git a/drivers/media/platform/rockchip/rkcif/rkcif-common.h b/drivers/media/platform/rockchip/rkcif/rkcif-common.h > index 395ec7e7e13b..597743e0c2fc 100644 > --- a/drivers/media/platform/rockchip/rkcif/rkcif-common.h > +++ b/drivers/media/platform/rockchip/rkcif/rkcif-common.h > @@ -23,6 +23,8 @@ > #include > #include > > +#include "rkcif-regs.h" > + > #define RKCIF_DRIVER_NAME "rockchip-cif" > #define RKCIF_CLK_MAX 4 > > @@ -83,17 +85,31 @@ struct rkcif_dummy_buffer { > u32 size; > }; > > +enum rkcif_plane_index { > + RKCIF_PLANE_Y, > + RKCIF_PLANE_UV, > + RKCIF_PLANE_MAX > +}; > + > struct rkcif_input_fmt { > u32 mbus_code; > > enum rkcif_format_type fmt_type; > enum v4l2_field field; > + > + union { > + u32 dvp_fmt_val; > + }; > }; > > struct rkcif_output_fmt { > u32 fourcc; > u32 mbus_code; > u8 cplanes; > + > + union { > + u32 dvp_fmt_val; > + }; > }; > > struct rkcif_interface; > @@ -167,9 +183,21 @@ struct rkcif_interface { > void (*set_crop)(struct rkcif_stream *stream, u16 left, u16 top); > }; > > +struct rkcif_dvp_match_data { > + const struct rkcif_input_fmt *in_fmts; > + unsigned int in_fmts_num; > + const struct rkcif_output_fmt *out_fmts; > + unsigned int out_fmts_num; > + void (*setup)(struct rkcif_device *rkcif); > + bool has_scaler; > + bool has_ids; > + unsigned int regs[RKCIF_DVP_REGISTER_MAX]; > +}; > + > struct rkcif_match_data { > const char *const *clks; > unsigned int clks_num; > + const struct rkcif_dvp_match_data *dvp; > }; > > struct rkcif_device { > diff --git a/drivers/media/platform/rockchip/rkcif/rkcif-dev.c b/drivers/media/platform/rockchip/rkcif/rkcif-dev.c > index 331634e5e74b..285676445e44 100644 > --- a/drivers/media/platform/rockchip/rkcif/rkcif-dev.c > +++ b/drivers/media/platform/rockchip/rkcif/rkcif-dev.c > @@ -22,6 +22,7 @@ > #include > #include > > +#include "rkcif-capture-dvp.h" > #include "rkcif-common.h" > > static const char *const px30_vip_clks[] = { > @@ -33,6 +34,7 @@ static const char *const px30_vip_clks[] = { > static const struct rkcif_match_data px30_vip_match_data = { > .clks = px30_vip_clks, > .clks_num = ARRAY_SIZE(px30_vip_clks), > + .dvp = &rkcif_px30_vip_dvp_match_data, > }; > > static const char *const rk3568_vicap_clks[] = { > @@ -62,11 +64,21 @@ MODULE_DEVICE_TABLE(of, rkcif_plat_of_match); > > static int rkcif_register(struct rkcif_device *rkcif) > { > + int ret; > + > + ret = rkcif_dvp_register(rkcif); > + if (ret && ret != -ENODEV) > + goto err; > + > return 0; > + > +err: > + return ret; > } > > static void rkcif_unregister(struct rkcif_device *rkcif) > { > + rkcif_dvp_unregister(rkcif); > } > > static int rkcif_notifier_bound(struct v4l2_async_notifier *notifier, > @@ -111,6 +123,9 @@ static irqreturn_t rkcif_isr(int irq, void *ctx) > { > irqreturn_t ret = IRQ_NONE; > > + if (rkcif_dvp_isr(irq, ctx) == IRQ_HANDLED) > + ret = IRQ_HANDLED; > + > return ret; > } > > diff --git a/drivers/media/platform/rockchip/rkcif/rkcif-regs.h b/drivers/media/platform/rockchip/rkcif/rkcif-regs.h > new file mode 100644 > index 000000000000..d50b6e14b5af > --- /dev/null > +++ b/drivers/media/platform/rockchip/rkcif/rkcif-regs.h > @@ -0,0 +1,131 @@ > +/* SPDX-License-Identifier: GPL-2.0 */ > +/* > + * Rockchip Camera Interface (CIF) Driver > + * > + * Copyright (C) 2018 Rockchip Electronics Co., Ltd. > + * Copyright (C) 2023 Mehdi Djait > + * Copyright (C) 2025 Michael Riesch > + */ > + > +#ifndef _RKCIF_REGS_H > +#define _RKCIF_REGS_H > + > +#define RKCIF_REGISTER_NOTSUPPORTED 0x420000 > +#define RKCIF_FETCH_Y(VAL) ((VAL) & 0x1fff) > +#define RKCIF_XY_COORD(x, y) (((y) << 16) | (x)) > + > +/* DVP register contents */ > +#define RKCIF_CTRL_ENABLE_CAPTURE BIT(0) > +#define RKCIF_CTRL_MODE_PINGPONG BIT(1) > +#define RKCIF_CTRL_MODE_LINELOOP BIT(2) > +#define RKCIF_CTRL_AXI_BURST_16 (0xf << 12) > + > +#define RKCIF_INTEN_FRAME_END_EN BIT(0) > +#define RKCIF_INTEN_LINE_ERR_EN BIT(2) > +#define RKCIF_INTEN_BUS_ERR_EN BIT(6) > +#define RKCIF_INTEN_SCL_ERR_EN BIT(7) > +#define RKCIF_INTEN_PST_INF_FRAME_END_EN BIT(9) > + > +#define RKCIF_INTSTAT_CLS 0x3ff > +#define RKCIF_INTSTAT_FRAME_END BIT(0) > +#define RKCIF_INTSTAT_LINE_END BIT(1) > +#define RKCIF_INTSTAT_LINE_ERR BIT(2) > +#define RKCIF_INTSTAT_PIX_ERR BIT(3) > +#define RKCIF_INTSTAT_DFIFO_OF BIT(5) > +#define RKCIF_INTSTAT_BUS_ERR BIT(6) > +#define RKCIF_INTSTAT_PRE_INF_FRAME_END BIT(8) > +#define RKCIF_INTSTAT_PST_INF_FRAME_END BIT(9) > +#define RKCIF_INTSTAT_FRAME_END_CLR BIT(0) > +#define RKCIF_INTSTAT_LINE_END_CLR BIT(1) > +#define RKCIF_INTSTAT_LINE_ERR_CLR BIT(2) > +#define RKCIF_INTSTAT_PST_INF_FRAME_END_CLR BIT(9) > +#define RKCIF_INTSTAT_ERR 0xfc > + > +#define RKCIF_FRAME_STAT_CLS 0x00 > +#define RKCIF_FRAME_FRM0_STAT_CLS 0x20 > + > +#define RKCIF_FORMAT_VSY_HIGH_ACTIVE BIT(0) > +#define RKCIF_FORMAT_HSY_LOW_ACTIVE BIT(1) > + > +#define RKCIF_FORMAT_INPUT_MODE_YUV (0x00 << 2) > +#define RKCIF_FORMAT_INPUT_MODE_PAL (0x02 << 2) > +#define RKCIF_FORMAT_INPUT_MODE_NTSC (0x03 << 2) > +#define RKCIF_FORMAT_INPUT_MODE_BT1120 (0x07 << 2) > +#define RKCIF_FORMAT_INPUT_MODE_RAW (0x04 << 2) > +#define RKCIF_FORMAT_INPUT_MODE_JPEG (0x05 << 2) > +#define RKCIF_FORMAT_INPUT_MODE_MIPI (0x06 << 2) > + > +#define RKCIF_FORMAT_YUV_INPUT_ORDER_UYVY (0x00 << 5) > +#define RKCIF_FORMAT_YUV_INPUT_ORDER_YVYU (0x01 << 5) > +#define RKCIF_FORMAT_YUV_INPUT_ORDER_VYUY (0x02 << 5) > +#define RKCIF_FORMAT_YUV_INPUT_ORDER_YUYV (0x03 << 5) > +#define RKCIF_FORMAT_YUV_INPUT_422 (0x00 << 7) > +#define RKCIF_FORMAT_YUV_INPUT_420 BIT(7) > + > +#define RKCIF_FORMAT_INPUT_420_ORDER_ODD BIT(8) > + > +#define RKCIF_FORMAT_CCIR_INPUT_ORDER_EVEN BIT(9) > + > +#define RKCIF_FORMAT_RAW_DATA_WIDTH_8 (0x00 << 11) > +#define RKCIF_FORMAT_RAW_DATA_WIDTH_10 (0x01 << 11) > +#define RKCIF_FORMAT_RAW_DATA_WIDTH_12 (0x02 << 11) > + > +#define RKCIF_FORMAT_YUV_OUTPUT_422 (0x00 << 16) > +#define RKCIF_FORMAT_YUV_OUTPUT_420 BIT(16) > + > +#define RKCIF_FORMAT_OUTPUT_420_ORDER_EVEN (0x00 << 17) > +#define RKCIF_FORMAT_OUTPUT_420_ORDER_ODD BIT(17) > + > +#define RKCIF_FORMAT_RAWD_DATA_LITTLE_ENDIAN (0x00 << 18) > +#define RKCIF_FORMAT_RAWD_DATA_BIG_ENDIAN BIT(18) > + > +#define RKCIF_FORMAT_UV_STORAGE_ORDER_UVUV (0x00 << 19) > +#define RKCIF_FORMAT_UV_STORAGE_ORDER_VUVU BIT(19) > + > +#define RKCIF_FORMAT_BT1120_CLOCK_SINGLE_EDGES (0x00 << 24) > +#define RKCIF_FORMAT_BT1120_CLOCK_DOUBLE_EDGES BIT(24) > +#define RKCIF_FORMAT_BT1120_TRANSMIT_INTERFACE (0x00 << 25) > +#define RKCIF_FORMAT_BT1120_TRANSMIT_PROGRESS BIT(25) > +#define RKCIF_FORMAT_BT1120_YC_SWAP BIT(26) > + > +#define RKCIF_SCL_CTRL_ENABLE_SCL_DOWN BIT(0) > +#define RKCIF_SCL_CTRL_ENABLE_SCL_UP BIT(1) > +#define RKCIF_SCL_CTRL_ENABLE_YUV_16BIT_BYPASS BIT(4) > +#define RKCIF_SCL_CTRL_ENABLE_RAW_16BIT_BYPASS BIT(5) > +#define RKCIF_SCL_CTRL_ENABLE_32BIT_BYPASS BIT(6) > +#define RKCIF_SCL_CTRL_DISABLE_32BIT_BYPASS (0x00 << 6) > + > +#define RKCIF_INTSTAT_F0_READY BIT(0) > +#define RKCIF_INTSTAT_F1_READY BIT(1) > + > +/* GRF register offsets and contents */ > +#define RK3568_GRF_VI_CON0 0x340 > +#define RK3568_GRF_VI_CON1 0x344 > +#define RK3568_GRF_VI_STATUS0 0x348 > + > +#define RK3568_GRF_VI_CON1_CIF_DATAPATH BIT(9) > +#define RK3568_GRF_VI_CON1_CIF_CLK_DELAYNUM GENMASK(6, 0) > + > +#define RK3568_GRF_WRITE_ENABLE(x) ((x) << 16) > + > +enum rkcif_dvp_register_index { > + RKCIF_DVP_CTRL, > + RKCIF_DVP_INTEN, > + RKCIF_DVP_INTSTAT, > + RKCIF_DVP_FOR, > + RKCIF_DVP_LINE_NUM_ADDR, > + RKCIF_DVP_FRM0_ADDR_Y, > + RKCIF_DVP_FRM0_ADDR_UV, > + RKCIF_DVP_FRM1_ADDR_Y, > + RKCIF_DVP_FRM1_ADDR_UV, > + RKCIF_DVP_VIR_LINE_WIDTH, > + RKCIF_DVP_SET_SIZE, > + RKCIF_DVP_SCL_CTRL, > + RKCIF_DVP_CROP, > + RKCIF_DVP_FRAME_STATUS, > + RKCIF_DVP_LAST_LINE, > + RKCIF_DVP_LAST_PIX, > + RKCIF_DVP_REGISTER_MAX > +}; > + > +#endif > Tested-by: Gerald Loacker Reviewed-by: Gerald Loacker Tested on Wolfvision PF5 (with Wolfvision PF5 IO Expander). Regards, Gerald