From patchwork Fri Sep 14 02:13:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Niklas_S=C3=B6derlund?= X-Patchwork-Id: 10600255 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 745D51823 for ; Fri, 14 Sep 2018 02:14:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9F8F02B6B5 for ; Fri, 14 Sep 2018 02:14:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 942D32B6AE; Fri, 14 Sep 2018 02:14:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B07172B6B2 for ; Fri, 14 Sep 2018 02:14:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728231AbeINH0i (ORCPT ); Fri, 14 Sep 2018 03:26:38 -0400 Received: from vsp-unauthed02.binero.net ([195.74.38.227]:33161 "EHLO vsp-unauthed02.binero.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728218AbeINH0h (ORCPT ); Fri, 14 Sep 2018 03:26:37 -0400 X-Halon-ID: e769a367-b7c3-11e8-b628-0050569116f7 Authorized-sender: niklas@soderlund.pp.se Received: from bismarck.berto.se (unknown [89.233.230.99]) by bin-vsp-out-03.atm.binero.net (Halon) with ESMTPA id e769a367-b7c3-11e8-b628-0050569116f7; Fri, 14 Sep 2018 04:14:26 +0200 (CEST) From: =?utf-8?q?Niklas_S=C3=B6derlund?= To: Laurent Pinchart , linux-media@vger.kernel.org Cc: linux-renesas-soc@vger.kernel.org, =?utf-8?q?Niklas_S=C3=B6derlund?= Subject: [PATCH 3/3] rcar-vin: declare which VINs can use a Up Down Scaler (UDS) Date: Fri, 14 Sep 2018 04:13:45 +0200 Message-Id: <20180914021345.9277-4-niklas.soderlund+renesas@ragnatech.se> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180914021345.9277-1-niklas.soderlund+renesas@ragnatech.se> References: <20180914021345.9277-1-niklas.soderlund+renesas@ragnatech.se> MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add information about which VINs on which SoC have access to a UDS scaler. Signed-off-by: Niklas Söderlund --- drivers/media/platform/rcar-vin/rcar-core.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/drivers/media/platform/rcar-vin/rcar-core.c b/drivers/media/platform/rcar-vin/rcar-core.c index 5dd16af3625c333b..64f74dfebbedbf78 100644 --- a/drivers/media/platform/rcar-vin/rcar-core.c +++ b/drivers/media/platform/rcar-vin/rcar-core.c @@ -920,12 +920,21 @@ static const struct rvin_group_route rcar_info_r8a7795_routes[] = { { /* Sentinel */ } }; +static const struct rvin_group_scaler rcar_info_h3_m3w_m3n_scalers[] = { + { .vin = 0, .companion = 1 }, + { .vin = 1, .companion = 0 }, + { .vin = 4, .companion = 5 }, + { .vin = 5, .companion = 4 }, + { /* Sentinel */ } +}; + static const struct rvin_info rcar_info_r8a7795 = { .model = RCAR_GEN3, .use_mc = true, .max_width = 4096, .max_height = 4096, .routes = rcar_info_r8a7795_routes, + .scalers = rcar_info_h3_m3w_m3n_scalers, }; static const struct rvin_group_route rcar_info_r8a7795es1_routes[] = { @@ -980,6 +989,7 @@ static const struct rvin_info rcar_info_r8a7795es1 = { .max_width = 4096, .max_height = 4096, .routes = rcar_info_r8a7795es1_routes, + .scalers = rcar_info_h3_m3w_m3n_scalers, }; static const struct rvin_group_route rcar_info_r8a7796_routes[] = { @@ -1020,6 +1030,7 @@ static const struct rvin_info rcar_info_r8a7796 = { .max_width = 4096, .max_height = 4096, .routes = rcar_info_r8a7796_routes, + .scalers = rcar_info_h3_m3w_m3n_scalers, }; static const struct rvin_group_route rcar_info_r8a77965_routes[] = { @@ -1064,6 +1075,7 @@ static const struct rvin_info rcar_info_r8a77965 = { .max_width = 4096, .max_height = 4096, .routes = rcar_info_r8a77965_routes, + .scalers = rcar_info_h3_m3w_m3n_scalers, }; static const struct rvin_group_route rcar_info_r8a77970_routes[] = { @@ -1089,12 +1101,18 @@ static const struct rvin_group_route rcar_info_r8a77995_routes[] = { { /* Sentinel */ } }; +static const struct rvin_group_scaler rcar_info_r8a77995_scalers[] = { + { .vin = 4, .companion = -1 }, + { /* Sentinel */ } +}; + static const struct rvin_info rcar_info_r8a77995 = { .model = RCAR_GEN3, .use_mc = true, .max_width = 4096, .max_height = 4096, .routes = rcar_info_r8a77995_routes, + .scalers = rcar_info_r8a77995_scalers, }; static const struct of_device_id rvin_of_id_table[] = {