From patchwork Mon Feb 12 09:44:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomi Valkeinen X-Patchwork-Id: 127975 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp3041140ljc; Mon, 12 Feb 2018 01:47:09 -0800 (PST) X-Google-Smtp-Source: AH8x225QAYrycY1OegJAnNr/lMjOlN1NpYao45UghIbkqn3riY+BpklNPkFj7dZiYbLYi02BI2QU X-Received: by 10.99.179.77 with SMTP id x13mr8923730pgt.135.1518428829356; Mon, 12 Feb 2018 01:47:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518428829; cv=none; d=google.com; s=arc-20160816; b=LqqB5rklj0sANgVPS1dqPoEQ5KgJFDhsYmMWeO1Om7E0DpoqMpZJd32qaxN8SMOJj2 junmF6/yVy2u6GevrCxXKUc1nlJThvrkuZ8k51Z6+Rts2KTpFs1i14kQmbnRAgt5tPX+ ZRsGmcWob0+mIHmPXjcnjAijmSDaRmgLb2JRtXz/SZ6Kbr/kgUN/NtVVbivMEUaVlIrP +ERBZ62cn9gkOMQeOpgWzlDirnPeN3EsLAMLi/KorItqmN0mIlWguer01ylN0Dw6L+9v O7ZxlMQyz0kN03ohJva/YtlZX5egJ0FcwEQO3tbsVffXWfxKT46Yl16hx3o3UsJfXw8B 8BVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:mime-version:references:in-reply-to:message-id:date :subject:to:from:dkim-signature:delivered-to :arc-authentication-results; bh=9LXe8R5c4gryOW8K0wHJEKiGqGJu+pGG3LG3cFs/d2o=; b=jHjVXgadys9mEb/JAmi50NDSMJ4aC7BZsRxzFcU6qLj14yStFOAkexhVaPco2c39tT KGRtVaSXZo0WDsZFnHQ5Ke9lyZzAQQyqfWKVETIi9uZR7q1tRMJwx0psNAzFFhfOlkYG NeEJKcschPVIB4vBLySRv/vRlqNDe2gSfqzlPcgbEASkc3Dk2Xrz0oJIZ0dE/rYCKhEA YxSZePDza78aYDROx5/natE8oM1kaFCaxS4KXXDXJRiSXv9LE43YIpZdD/CQVNsqYWJA XyD5vhLd5Nleu1AyeDrdmDfNKVk1cGbGbK6K1mJpng4d4jzPnE5rtFB4wELppbgmoZjf oBMw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@ti.com header.s=ti-com-17Q1 header.b=v7n3vDI7; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTPS id u8-v6si396794plh.41.2018.02.12.01.47.09 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 Feb 2018 01:47:09 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@ti.com header.s=ti-com-17Q1 header.b=v7n3vDI7; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 182566E0FD; Mon, 12 Feb 2018 09:45:41 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from fllnx210.ext.ti.com (fllnx210.ext.ti.com [198.47.19.17]) by gabe.freedesktop.org (Postfix) with ESMTPS id C461C6E0EA for ; Mon, 12 Feb 2018 09:45:38 +0000 (UTC) Received: from dflxv15.itg.ti.com ([128.247.5.124]) by fllnx210.ext.ti.com (8.15.1/8.15.1) with ESMTP id w1C9jaQl009897; Mon, 12 Feb 2018 03:45:36 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ti.com; s=ti-com-17Q1; t=1518428736; bh=Oh23RZxPNbD2CTTOQLVNISN1kTvTMYiw6XvLZ3RF464=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=v7n3vDI7YySOKgFRkfDy9UJePNJl+MRB/WHhujhaQBBJ1pKq+kmMq5Pq7gqF3JBud OZgu5WHIR1hRl18TDcXEoGcdKXHEe3eqkHFwgIJyAhAx/ait7sADSG1Wqo2Si4Of8z ys/86BbxjQdkA3ARcY8UBoB64jItr42a/lCSw4Sw= Received: from DLEE100.ent.ti.com (dlee100.ent.ti.com [157.170.170.30]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id w1C9ja9C020412; Mon, 12 Feb 2018 03:45:36 -0600 Received: from DLEE108.ent.ti.com (157.170.170.38) by DLEE100.ent.ti.com (157.170.170.30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1261.35; Mon, 12 Feb 2018 03:45:36 -0600 Received: from dflp33.itg.ti.com (10.64.6.16) by DLEE108.ent.ti.com (157.170.170.38) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1261.35 via Frontend Transport; Mon, 12 Feb 2018 03:45:36 -0600 Received: from deskari.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp33.itg.ti.com (8.14.3/8.13.8) with ESMTP id w1C9j0NF003439; Mon, 12 Feb 2018 03:45:34 -0600 From: Tomi Valkeinen To: , Laurent Pinchart , Peter Ujfalusi , Jyri Sarha , Benoit Parrot Subject: [PATCH 18/24] drm/omap: fix WBDELAYCOUNT with interlace Date: Mon, 12 Feb 2018 11:44:48 +0200 Message-ID: <1518428694-18018-19-git-send-email-tomi.valkeinen@ti.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1518428694-18018-1-git-send-email-tomi.valkeinen@ti.com> References: <1518428694-18018-1-git-send-email-tomi.valkeinen@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Tomi Valkeinen Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Vertical blanking needs to be halved on interlace modes. WBDELAYCOUNT was calculated without such halving, resulting in WBUNCOMPLETE errors. Signed-off-by: Tomi Valkeinen Acked-by: Benoit Parrot --- drivers/gpu/drm/omapdrm/dss/dispc.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/omapdrm/dss/dispc.c b/drivers/gpu/drm/omapdrm/dss/dispc.c index 669ee9df224b..99bbc97d0de4 100644 --- a/drivers/gpu/drm/omapdrm/dss/dispc.c +++ b/drivers/gpu/drm/omapdrm/dss/dispc.c @@ -2710,14 +2710,18 @@ int dispc_wb_setup(const struct omap_dss_writeback_info *wi, /* WBDELAYCOUNT */ REG_FLD_MOD(DISPC_OVL_ATTRIBUTES2(plane), 0, 7, 0); } else { - int wbdelay; + u32 wbdelay; if (channel_in == DSS_WB_TV_MGR) - wbdelay = min(vm->vsync_len + vm->vback_porch, - (u32)255); + wbdelay = vm->vsync_len + vm->vback_porch; else - wbdelay = min(vm->vfront_porch + - vm->vsync_len + vm->vback_porch, (u32)255); + wbdelay = vm->vfront_porch + vm->vsync_len + + vm->vback_porch; + + if (vm->flags & DISPLAY_FLAGS_INTERLACED) + wbdelay /= 2; + + wbdelay = min(wbdelay, 255u); /* WBDELAYCOUNT */ REG_FLD_MOD(DISPC_OVL_ATTRIBUTES2(plane), wbdelay, 7, 0);