From patchwork Mon Apr 16 12:16:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Osipenko X-Patchwork-Id: 10344495 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 6680860548 for ; Tue, 17 Apr 2018 07:42:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5A755287D0 for ; Tue, 17 Apr 2018 07:42:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4F48828894; Tue, 17 Apr 2018 07:42:23 +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=-5.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, MAILING_LIST_MULTI, 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]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E3046287D0 for ; Tue, 17 Apr 2018 07:42:22 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D0E986E433; Tue, 17 Apr 2018 07:41:54 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pf0-x242.google.com (mail-pf0-x242.google.com [IPv6:2607:f8b0:400e:c00::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 00CDB6E2C2 for ; Mon, 16 Apr 2018 12:17:32 +0000 (UTC) Received: by mail-pf0-x242.google.com with SMTP id z9so3633265pfe.6 for ; Mon, 16 Apr 2018 05:17:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=01Ytva32re9fI5tFx1h4oZRHMoIm3oHIgNpeokuwzp4=; b=Vv1COTxolXAtjFc4nx8qaXlHEm03gd2th67BS/VOoDYqonyw/HdY1Dovamvs1hFbZn WHxmEzQpeCRfCFvIANugMXGxPy/qdM3JF6bXW1CGZGbXeVEBTayOzO61Vi9s3Mk1sqgk r22njL1yQt/s9uidgBz34qKQ83BV0BNMBE2us9NC1AGgWElLfPglbR4jRTV1ITZw2Hkx YU+T/TMaUpnxDZ//HG6sFaFe2RtCsBw1u2+6i5B6lj/TB1gktInqpTnSx18u/2XCssst fI5wAtqFkdUk+vS7lmTMnRFx5rvm5alo8qZ0sh3jvr6yNM2wieeE0nF3IbS++yci+BQ4 bH7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=01Ytva32re9fI5tFx1h4oZRHMoIm3oHIgNpeokuwzp4=; b=iEhemaMg53ixBQOwIjzHPyRKOXKzEG2w+sMT0VOAOdEA2tjvmmmwmm+sURF1ZaC9sD Z4GUHpfabONk90RVkxcBMgO0RmAgBD1/tbr701rpzasM6vUsLBwdlrRWs0PuFh20N6sn PmV8yECPKOSDHt+pcF0u1x3vA9vLT1vemYVEt93stNtE27IwP3NXVE8G5SFth2iemRJL 3pOeUim3NVD/sMrUTzI5tk8fmMJ6D1I/rEd5od4KMrCBApZ3w47164dLotbt6T/PvY7m Hg9sa/QiA+YmrO7HD7fAUEKsxqxXdFxQZzJ936B9DL/eqPFEvOUW68OzrnCTUsoCThJo AVaA== X-Gm-Message-State: ALQs6tC2PVxCa0KO4c3u0KS0vCZkLOhPpkh/2AMl8NabhInNoyryEo6j hM6a+Zm1QTmWxxmMBXWfIV4TBdiS X-Google-Smtp-Source: AIpwx49ykl7nFMrrfuYOznY2NQ0G/OxUj20F4Q0vuOWhiBpkBH4Q2gXnFccN+ocOcEb5HRxCEOkAsQ== X-Received: by 10.101.89.6 with SMTP id f6mr12542485pgu.178.1523881052445; Mon, 16 Apr 2018 05:17:32 -0700 (PDT) Received: from localhost.localdomain (ppp109-252-91-201.pppoe.spdop.ru. [109.252.91.201]) by smtp.gmail.com with ESMTPSA id p1sm23524153pfp.48.2018.04.16.05.17.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Apr 2018 05:17:31 -0700 (PDT) From: Dmitry Osipenko To: Thierry Reding Subject: [PATCH v1 2/4] drm/tegra: dc: Rename supports_blending to legacy_blending Date: Mon, 16 Apr 2018 15:16:26 +0300 Message-Id: <9a70c238b02fabb2af14508dc31d41820a71bebd.1523880381.git.digetx@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: References: In-Reply-To: References: X-Mailman-Approved-At: Tue, 17 Apr 2018 07:41:47 +0000 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: linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Older Tegra's support blending. Rename SoC info entry supports_blending to legacy_blending to eliminate confusion. Signed-off-by: Dmitry Osipenko --- drivers/gpu/drm/tegra/dc.c | 20 ++++++++++---------- drivers/gpu/drm/tegra/dc.h | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c index a2bf216d8854..a54eefea2513 100644 --- a/drivers/gpu/drm/tegra/dc.c +++ b/drivers/gpu/drm/tegra/dc.c @@ -440,10 +440,10 @@ static void tegra_dc_setup_window(struct tegra_plane *plane, tegra_plane_writel(plane, value, DC_WIN_WIN_OPTIONS); - if (dc->soc->supports_blending) - tegra_plane_setup_blending(plane, window); - else + if (dc->soc->legacy_blending) tegra_plane_setup_blending_legacy(plane); + else + tegra_plane_setup_blending(plane, window); } static const u32 tegra20_primary_formats[] = { @@ -549,7 +549,7 @@ static int tegra_plane_atomic_check(struct drm_plane *plane, * the corresponding opaque formats. However, the opaque formats can * be emulated by disabling alpha blending for the plane. */ - if (!dc->soc->supports_blending) { + if (dc->soc->legacy_blending) { err = tegra_plane_setup_legacy_state(tegra, plane_state); if (err < 0) return err; @@ -2092,7 +2092,7 @@ static const struct tegra_dc_soc_info tegra20_dc_soc_info = { .supports_interlacing = false, .supports_cursor = false, .supports_block_linear = false, - .supports_blending = false, + .legacy_blending = true, .pitch_align = 8, .has_iommu = false, .has_powergate = false, @@ -2110,7 +2110,7 @@ static const struct tegra_dc_soc_info tegra30_dc_soc_info = { .supports_interlacing = false, .supports_cursor = false, .supports_block_linear = false, - .supports_blending = false, + .legacy_blending = true, .pitch_align = 8, .has_iommu = true, .has_powergate = false, @@ -2128,7 +2128,7 @@ static const struct tegra_dc_soc_info tegra114_dc_soc_info = { .supports_interlacing = false, .supports_cursor = false, .supports_block_linear = false, - .supports_blending = false, + .legacy_blending = true, .pitch_align = 64, .has_iommu = true, .has_powergate = true, @@ -2146,7 +2146,7 @@ static const struct tegra_dc_soc_info tegra124_dc_soc_info = { .supports_interlacing = true, .supports_cursor = true, .supports_block_linear = true, - .supports_blending = true, + .legacy_blending = false, .pitch_align = 64, .has_iommu = true, .has_powergate = true, @@ -2164,7 +2164,7 @@ static const struct tegra_dc_soc_info tegra210_dc_soc_info = { .supports_interlacing = true, .supports_cursor = true, .supports_block_linear = true, - .supports_blending = true, + .legacy_blending = false, .pitch_align = 64, .has_iommu = true, .has_powergate = true, @@ -2216,7 +2216,7 @@ static const struct tegra_dc_soc_info tegra186_dc_soc_info = { .supports_interlacing = true, .supports_cursor = true, .supports_block_linear = true, - .supports_blending = true, + .legacy_blending = false, .pitch_align = 64, .has_powergate = false, .coupled_pm = false, diff --git a/drivers/gpu/drm/tegra/dc.h b/drivers/gpu/drm/tegra/dc.h index d0bbcbcde4c1..3156006e75c6 100644 --- a/drivers/gpu/drm/tegra/dc.h +++ b/drivers/gpu/drm/tegra/dc.h @@ -55,7 +55,7 @@ struct tegra_dc_soc_info { bool supports_interlacing; bool supports_cursor; bool supports_block_linear; - bool supports_blending; + bool legacy_blending; unsigned int pitch_align; bool has_iommu; bool has_powergate;