From patchwork Thu Jul 7 23:03:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Longerbeam X-Patchwork-Id: 9220031 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 19F8F60574 for ; Fri, 8 Jul 2016 05:26:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0C17F2840B for ; Fri, 8 Jul 2016 05:26:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 00FA028411; Fri, 8 Jul 2016 05:26:44 +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=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AED572840B for ; Fri, 8 Jul 2016 05:26:44 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3E5C66E873; Fri, 8 Jul 2016 05:26:21 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pf0-x241.google.com (mail-pf0-x241.google.com [IPv6:2607:f8b0:400e:c00::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id EE4BE6E839 for ; Thu, 7 Jul 2016 23:04:21 +0000 (UTC) Received: by mail-pf0-x241.google.com with SMTP id i123so2895596pfg.3 for ; Thu, 07 Jul 2016 16:04:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=P3DdxDCDsDs3pbb9ytZvD5oQLiJTr19lAZTiSyNWz7k=; b=UOc6/juG43+QT+7BYgvYsR6uedbaD1/KxBrnzCPQqzxDjQG1WW54kdB9HRWNAQcZUP JMQDdSNGOcM0a97gsjrRgI0oFHbLNhRB736u8sT+/YKD3hYNdz4n49/R69jztORAPZso UgT/1uxzUsURj3MPCEgpGVOPtuDcNO3muM1D+ow9ICDhrscGn3jfWPxo7yO7c427FwW9 9+LUeD1XFxmCG9G0HNnNsDXe/Zz3w0t8mjA0H2zezW28J3Z4q4njw+Jch7TceHWbbR4x gHC3Ciuya5U8KBPsBBmKBDso3AGLcaMFa+lwQIdAzFn+Ql7bcsRQRn/8igNjZ6A7tID8 R24g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=P3DdxDCDsDs3pbb9ytZvD5oQLiJTr19lAZTiSyNWz7k=; b=BRlR2C0KNNkMG4l6HJqI2WmwBlXXXAZkl1g3cwThOgnhHYlhX9Fi2M1Abq9V3M9mqM 2IW+3q/RzazpgcTrjw1N2WoizCm5UQyxfmstXgyWEgAhjbtTr1zgtCsFBqQioOZMpHK7 KA/Ol9eI24nsxo2+qXX17hfISGO91Zb4b7ya76Uzxatpi45L3ztuzr55fqC7vQRHcUi2 eWHXuY+PWisMo/Gktw/FmeOgMoUFDpwpNreQyuLm7Gxg8nASeAmEiXP4ZYAG+K2JB0W9 x8y0Jdb5kkOvQx9C7+sN1M14qMUemMsx6a0pGl7e+FidWQwSQeYVxVEWkV4zZefZNqZC jSIw== X-Gm-Message-State: ALyK8tI86eI2mr7zZ3KHpBgnN5KPYJp8PZ/xPW51YqjCYIC6Y+4oK3VIqHm4lpx13HuW2Q== X-Received: by 10.98.52.3 with SMTP id b3mr4532637pfa.40.1467932661271; Thu, 07 Jul 2016 16:04:21 -0700 (PDT) Received: from mothership.sklembedded.com (c-73-241-2-21.hsd1.ca.comcast.net. [73.241.2.21]) by smtp.googlemail.com with ESMTPSA id z29sm6846719pff.0.2016.07.07.16.04.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 07 Jul 2016 16:04:20 -0700 (PDT) From: Steve Longerbeam X-Google-Original-From: Steve Longerbeam To: p.zabel@pengutronix.de Subject: [PATCH 10/16] gpu: ipu-v3: set correct full sensor frame for PAL/NTSC Date: Thu, 7 Jul 2016 16:03:35 -0700 Message-Id: <1467932621-358-11-git-send-email-steve_longerbeam@mentor.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1467932621-358-1-git-send-email-steve_longerbeam@mentor.com> References: <1467932621-358-1-git-send-email-steve_longerbeam@mentor.com> X-Mailman-Approved-At: Fri, 08 Jul 2016 05:26:19 +0000 Cc: Steve Longerbeam , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Set the sensor full frame based on whether the passed in mbus_fmt is 720x480 (NTSC) or 720x576 (PAL). Signed-off-by: Steve Longerbeam --- drivers/gpu/ipu-v3/ipu-csi.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/ipu-v3/ipu-csi.c b/drivers/gpu/ipu-v3/ipu-csi.c index 336dc06..07c7091 100644 --- a/drivers/gpu/ipu-v3/ipu-csi.c +++ b/drivers/gpu/ipu-v3/ipu-csi.c @@ -365,10 +365,14 @@ int ipu_csi_init_interface(struct ipu_csi *csi, { struct ipu_csi_bus_config cfg; unsigned long flags; - u32 data = 0; + u32 width, height, data = 0; fill_csi_bus_cfg(&cfg, mbus_cfg, mbus_fmt); + /* set default sensor frame width and height */ + width = mbus_fmt->width; + height = mbus_fmt->height; + /* Set the CSI_SENS_CONF register remaining fields */ data |= cfg.data_width << CSI_SENS_CONF_DATA_WIDTH_SHIFT | cfg.data_fmt << CSI_SENS_CONF_DATA_FMT_SHIFT | @@ -386,11 +390,6 @@ int ipu_csi_init_interface(struct ipu_csi *csi, ipu_csi_write(csi, data, CSI_SENS_CONF); - /* Setup sensor frame size */ - ipu_csi_write(csi, - (mbus_fmt->width - 1) | ((mbus_fmt->height - 1) << 16), - CSI_SENS_FRM_SIZE); - /* Set CCIR registers */ switch (cfg.clk_mode) { @@ -408,11 +407,12 @@ int ipu_csi_init_interface(struct ipu_csi *csi, * Field1BlankEnd = 0x7, Field1BlankStart = 0x3, * Field1ActiveEnd = 0x5, Field1ActiveStart = 0x1 */ + height = 625; /* framelines for PAL */ + ipu_csi_write(csi, 0x40596 | CSI_CCIR_ERR_DET_EN, CSI_CCIR_CODE_1); ipu_csi_write(csi, 0xD07DF, CSI_CCIR_CODE_2); ipu_csi_write(csi, 0xFF0000, CSI_CCIR_CODE_3); - } else if (mbus_fmt->width == 720 && mbus_fmt->height == 480) { /* * NTSC case @@ -422,6 +422,8 @@ int ipu_csi_init_interface(struct ipu_csi *csi, * Field1BlankEnd = 0x6, Field1BlankStart = 0x2, * Field1ActiveEnd = 0x4, Field1ActiveStart = 0 */ + height = 525; /* framelines for NTSC */ + ipu_csi_write(csi, 0xD07DF | CSI_CCIR_ERR_DET_EN, CSI_CCIR_CODE_1); ipu_csi_write(csi, 0x40596, CSI_CCIR_CODE_2); @@ -447,6 +449,10 @@ int ipu_csi_init_interface(struct ipu_csi *csi, break; } + /* Setup sensor frame size */ + ipu_csi_write(csi, (width - 1) | ((height - 1) << 16), + CSI_SENS_FRM_SIZE); + dev_dbg(csi->ipu->dev, "CSI_SENS_CONF = 0x%08X\n", ipu_csi_read(csi, CSI_SENS_CONF)); dev_dbg(csi->ipu->dev, "CSI_ACT_FRM_SIZE = 0x%08X\n",