From patchwork Fri May 11 14:15:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Niklas_S=C3=B6derlund?= X-Patchwork-Id: 10394337 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id BD2C660153 for ; Fri, 11 May 2018 14:16:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BEBF528D96 for ; Fri, 11 May 2018 14:16:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B334428DCA; Fri, 11 May 2018 14:16:45 +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 670E428D96 for ; Fri, 11 May 2018 14:16:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752948AbeEKOQo (ORCPT ); Fri, 11 May 2018 10:16:44 -0400 Received: from bin-mail-out-05.binero.net ([195.74.38.228]:63216 "EHLO bin-mail-out-05.binero.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752394AbeEKOQm (ORCPT ); Fri, 11 May 2018 10:16:42 -0400 X-Halon-ID: ebaab754-5525-11e8-a514-005056917a89 Authorized-sender: niklas@soderlund.pp.se Received: from bismarck.berto.se (unknown [89.233.230.99]) by bin-vsp-out-01.atm.binero.net (Halon) with ESMTPA id ebaab754-5525-11e8-a514-005056917a89; Fri, 11 May 2018 16:16:39 +0200 (CEST) From: =?UTF-8?q?Niklas=20S=C3=B6derlund?= To: Laurent Pinchart , Hans Verkuil , linux-media@vger.kernel.org Cc: linux-renesas-soc@vger.kernel.org, =?UTF-8?q?Niklas=20S=C3=B6derlund?= Subject: [PATCH 1/2] Revert "media: rcar-vin: enable field toggle after a set number of lines for Gen3" Date: Fri, 11 May 2018 16:15:40 +0200 Message-Id: <20180511141541.3164-2-niklas.soderlund+renesas@ragnatech.se> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180511141541.3164-1-niklas.soderlund+renesas@ragnatech.se> References: <20180511141541.3164-1-niklas.soderlund+renesas@ragnatech.se> 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 This reverts commit 015060cb7795eac34454696cc9c9f8b76926a401. --- drivers/media/platform/rcar-vin/rcar-dma.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/drivers/media/platform/rcar-vin/rcar-dma.c b/drivers/media/platform/rcar-vin/rcar-dma.c index b41ba9a4a2b3ac90..ac07f99e3516a620 100644 --- a/drivers/media/platform/rcar-vin/rcar-dma.c +++ b/drivers/media/platform/rcar-vin/rcar-dma.c @@ -124,9 +124,7 @@ #define VNDMR2_VPS (1 << 30) #define VNDMR2_HPS (1 << 29) #define VNDMR2_FTEV (1 << 17) -#define VNDMR2_FTEH (1 << 16) #define VNDMR2_VLV(n) ((n & 0xf) << 12) -#define VNDMR2_HLV(n) ((n) & 0xfff) /* Video n CSI2 Interface Mode Register (Gen3) */ #define VNCSI_IFMD_DES1 (1 << 26) @@ -614,9 +612,8 @@ void rvin_crop_scale_comp(struct rvin_dev *vin) static int rvin_setup(struct rvin_dev *vin) { - u32 vnmc, dmr, dmr2, interrupts, lines; + u32 vnmc, dmr, dmr2, interrupts; bool progressive = false, output_is_yuv = false, input_is_yuv = false; - bool halfsize = false; switch (vin->format.field) { case V4L2_FIELD_TOP: @@ -631,15 +628,12 @@ static int rvin_setup(struct rvin_dev *vin) /* Use BT if video standard can be read and is 60 Hz format */ if (!vin->info->use_mc && vin->std & V4L2_STD_525_60) vnmc = VNMC_IM_FULL | VNMC_FOC; - halfsize = true; break; case V4L2_FIELD_INTERLACED_TB: vnmc = VNMC_IM_FULL; - halfsize = true; break; case V4L2_FIELD_INTERLACED_BT: vnmc = VNMC_IM_FULL | VNMC_FOC; - halfsize = true; break; case V4L2_FIELD_NONE: vnmc = VNMC_IM_ODD_EVEN; @@ -682,15 +676,11 @@ static int rvin_setup(struct rvin_dev *vin) break; } - if (vin->info->model == RCAR_GEN3) { - /* Enable HSYNC Field Toggle mode after height HSYNC inputs. */ - lines = vin->format.height / (halfsize ? 2 : 1); - dmr2 = VNDMR2_FTEH | VNDMR2_HLV(lines); - vin_dbg(vin, "Field Toogle after %u lines\n", lines); - } else { - /* Enable VSYNC Field Toogle mode after one VSYNC input. */ + /* Enable VSYNC Field Toogle mode after one VSYNC input */ + if (vin->info->model == RCAR_GEN3) + dmr2 = VNDMR2_FTEV; + else dmr2 = VNDMR2_FTEV | VNDMR2_VLV(1); - } /* Hsync Signal Polarity Select */ if (!(vin->mbus_cfg.flags & V4L2_MBUS_HSYNC_ACTIVE_LOW))