From patchwork Fri May 4 00:08:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Osipenko X-Patchwork-Id: 10382351 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 46C0260467 for ; Sat, 5 May 2018 20:12:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3686728917 for ; Sat, 5 May 2018 20:12:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2B5D028A3B; Sat, 5 May 2018 20:12:28 +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 A939328917 for ; Sat, 5 May 2018 20:12:27 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id ABB6C6E1CD; Sat, 5 May 2018 20:08:33 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lf0-x244.google.com (mail-lf0-x244.google.com [IPv6:2a00:1450:4010:c07::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id C7EB06E6F7 for ; Fri, 4 May 2018 00:09:29 +0000 (UTC) Received: by mail-lf0-x244.google.com with SMTP id u21-v6so28484403lfu.9 for ; Thu, 03 May 2018 17:09:29 -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=BNRvwT4xO3iB1aL22wleCKVQHHcQzqz2k6pVxEFn1s0=; b=UOSITjclRDlIa8MKlYDYe1+7MXEm5M6RVZN6oa4270bAjOavxLSzAi+iFaJF60xheG SfrmGAftzXGnum8uYKGQlpoGrKQ0WrA7G9ToB4Y0aAWEn2/PsFxYZQRtbxRo71fKE8FM fPJ+aEGdGKIq9u/rc6E1B4tJ/oo77dxs0A4oAEmOZpgbc3e+FAfwfY6Ihj5rHvFTLlNf QiVMa6LvAIj7fNgf4Op2nlPL2AYrLbuAN58jInHKCprN4+syyUD0KEc4pOQYJPQZh9XZ GILVe6o7NykZogxzwdXzs5SAol/7sTDZQpNeIXYiiR8QdHi9/ZVO2e2T0sHYcCyzVbIM KshA== 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=BNRvwT4xO3iB1aL22wleCKVQHHcQzqz2k6pVxEFn1s0=; b=VRQr/Y8sbXBUatlCJ4U5gtJbCcXWsF3BKL9mqAamdTjbBo+MSKwJNl+hSHxF+dN956 TTLDcdj/XPB1v9IzK84cNvY5Fs9OUoGWfH4K4TvQ8l790iCRsISK3yZkdZyZCd15gwlA 3/MjRtv2fNET0thS3d7V1uihdWNYfzNIZwNIEL5J+cTN9zSQ/4x0U4AUSRZldsXWsDLn nJONJkdo6lnB4pG052Ztr5Wssnsykt9AqxDhlLghNH/7zBy+uX/3Rn8i2tOWZyM/vCG3 Us6qgBMig9eAQEAAk/8/P66VRbR2Xu4phwUx4Y0HZDj4V8PpqOKKvxi7Lj1CppVl6bly pbCA== X-Gm-Message-State: ALQs6tBOBs3/NFJ5lS+nZVwGbf9nLwWcXLmX0iC11yzxyLV98qOhVYyu 6Lz4NxFednMN5NqbdNPONAsLZxww X-Google-Smtp-Source: AB8JxZoDX/o2vSWleI3sw0WPD5Oq3hehx27QPYnBPOsi7JyoOuz/1y6wq7ls9hG6Pb0S0Q9f46DCfg== X-Received: by 2002:a19:4e4a:: with SMTP id c71-v6mr16443417lfb.42.1525392568122; Thu, 03 May 2018 17:09:28 -0700 (PDT) Received: from localhost.localdomain (ppp109-252-91-130.pppoe.spdop.ru. [109.252.91.130]) by smtp.gmail.com with ESMTPSA id d85-v6sm1405837lfl.29.2018.05.03.17.09.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 03 May 2018 17:09:27 -0700 (PDT) From: Dmitry Osipenko To: Thierry Reding Subject: [PATCH v1 3/3] drm/tegra: dc: Rename supports_blending to has_legacy_blending Date: Fri, 4 May 2018 03:08:44 +0300 Message-Id: <20180504000844.18661-4-digetx@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180504000844.18661-1-digetx@gmail.com> References: <20180504000844.18661-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 ba5481cd470d..fe00b3250f6a 100644 --- a/drivers/gpu/drm/tegra/dc.c +++ b/drivers/gpu/drm/tegra/dc.c @@ -478,10 +478,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[] = { @@ -587,7 +587,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; @@ -2069,7 +2069,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, @@ -2088,7 +2088,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, @@ -2107,7 +2107,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, @@ -2126,7 +2126,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, @@ -2145,7 +2145,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, @@ -2198,7 +2198,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 5c3d1d6faa3b..ca5cac6bf8ea 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;