From patchwork Fri May 4 14:40:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Osipenko X-Patchwork-Id: 10382311 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 C765660159 for ; Sat, 5 May 2018 20:10:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B4C1228917 for ; Sat, 5 May 2018 20:10:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A943B28A3B; Sat, 5 May 2018 20:10:13 +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 5675928917 for ; Sat, 5 May 2018 20:10:13 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6A1CC6E25A; Sat, 5 May 2018 20:08:06 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lf0-x242.google.com (mail-lf0-x242.google.com [IPv6:2a00:1450:4010:c07::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 605D76E1F9 for ; Fri, 4 May 2018 14:41:02 +0000 (UTC) Received: by mail-lf0-x242.google.com with SMTP id u21-v6so31281554lfu.9 for ; Fri, 04 May 2018 07:41:02 -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; bh=GosrFNxPAqEcQ5H084GZJ79D6r1SLlGfSU+Qaj+dlYA=; b=SHKAYh8QNkBhwcqdW0+TAkl6mckrT0WQUXC2HpCQN6iH2xUN45vfyQpG7w24HVRWV6 UD9xBiN05OH8Xxpzv+zpPOI124/DZDMxduEBBNFrZncPh33FZwiFS7YO4VhqfGYYnDHA MPSBAjL9Yp7oUI8a/Z5ZsgFuntx8PNrt5rMNc6K4/aRYQGVdB0SH1PJe0owQd4mzz1Xt Q03319n96J+7uPkSAAD7gTk/pCYpG5yn1bgO9r4s8zv8ibb2oh9ZtC47bbTqYnw3QHdi NOM7fs+BA6xek11ZxuI9jkdt0JSINFsIyVrMRFOWtaao+/aS1yKWjUiGjptyu6FzTVTF 6nfA== 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; bh=GosrFNxPAqEcQ5H084GZJ79D6r1SLlGfSU+Qaj+dlYA=; b=CYlIDYrcC6zukb7uv07Qm8MWiYRVx0TRQxhlhqp+g+OXm+JQZU6f+dQRj+xphMT1qd dCzwygl44ZYOivoHB+tMuGNN2LYIh0hYnCyXSqUgVeOUKTY1M41S+cz9QLTDDRTkPWyt oOaTygGXXsF/sqNvjwMAMWrfVcSFqfKquI0ZDoWE8gkJc7DyDrsLcesnHrjvo5G5juQ1 3EKq7m8x/0/zyRseC1YgbxZewrZe5xBPYUA4k4kVbbR1RoOFkxpP+K4z/pK2Hohg/MLt k22pXHUcIgT+Old8aYwnwcrldeR2jNfOAyvM0t0qqHzmvXTXGrwxl9WVt2XOJlyjWt/j O42Q== X-Gm-Message-State: ALQs6tACcwBF0yE2R8TcRE4Tkd68tTL44UUNLOHbkjRLBAyY+23+L207 DpnJhjIlQ3kO6eyfD43erATUMyKT X-Google-Smtp-Source: AB8JxZpoohryzGILufC0kUf4OrCDTgxWJqqf/eAuZAIsQLLfbiEXA3W//5PLo1A5USns2hiT1ZizkA== X-Received: by 2002:a2e:3e0c:: with SMTP id l12-v6mr20150172lja.23.1525444860840; Fri, 04 May 2018 07:41:00 -0700 (PDT) Received: from localhost.localdomain (109-252-91-130.nat.spd-mgts.ru. [109.252.91.130]) by smtp.gmail.com with ESMTPSA id b202-v6sm3301309lfg.83.2018.05.04.07.40.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 04 May 2018 07:41:00 -0700 (PDT) From: Dmitry Osipenko To: Thierry Reding Subject: [PATCH v2 3/3] drm/tegra: dc: Rename supports_blending to has_legacy_blending Date: Fri, 4 May 2018 17:40:00 +0300 Message-Id: <20180504144000.8597-4-digetx@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180504144000.8597-1-digetx@gmail.com> References: <20180504144000.8597-1-digetx@gmail.com> X-Mailman-Approved-At: Sat, 05 May 2018 20:07:53 +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 has_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 be624ac700a8..c28a0a2d496b 100644 --- a/drivers/gpu/drm/tegra/dc.c +++ b/drivers/gpu/drm/tegra/dc.c @@ -508,10 +508,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->has_legacy_blending) tegra_plane_setup_blending_legacy(plane); + else + tegra_plane_setup_blending(plane, window); } static const u32 tegra20_primary_formats[] = { @@ -617,7 +617,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->has_legacy_blending) { err = tegra_plane_setup_legacy_state(tegra, plane_state); if (err < 0) return err; @@ -2099,7 +2099,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, + .has_legacy_blending = true, .pitch_align = 8, .has_powergate = false, .coupled_pm = true, @@ -2118,7 +2118,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, + .has_legacy_blending = true, .pitch_align = 8, .has_powergate = false, .coupled_pm = false, @@ -2137,7 +2137,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, + .has_legacy_blending = true, .pitch_align = 64, .has_powergate = true, .coupled_pm = false, @@ -2156,7 +2156,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, + .has_legacy_blending = false, .pitch_align = 64, .has_powergate = true, .coupled_pm = false, @@ -2175,7 +2175,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, + .has_legacy_blending = false, .pitch_align = 64, .has_powergate = true, .coupled_pm = false, @@ -2228,7 +2228,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, + .has_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 8673cd97afc3..0774356c845a 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 has_legacy_blending; unsigned int pitch_align; bool has_powergate; bool coupled_pm;