From patchwork Sat Aug 18 16:03:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Osipenko X-Patchwork-Id: 10570179 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CA3B9112E for ; Mon, 20 Aug 2018 10:47:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BA0D729164 for ; Mon, 20 Aug 2018 10:47:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AE6B92916B; Mon, 20 Aug 2018 10:47:43 +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.2 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED 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 78B3329164 for ; Mon, 20 Aug 2018 10:47:43 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 584B889DC0; Mon, 20 Aug 2018 10:47:19 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-ed1-x544.google.com (mail-ed1-x544.google.com [IPv6:2a00:1450:4864:20::544]) by gabe.freedesktop.org (Postfix) with ESMTPS id CA5F56E12C for ; Sat, 18 Aug 2018 16:04:47 +0000 (UTC) Received: by mail-ed1-x544.google.com with SMTP id b10-v6so6120420eds.4 for ; Sat, 18 Aug 2018 09:04:47 -0700 (PDT) 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; bh=KuLe+/5rg+5G46E5wn77BiKqpUhL/hj6Vg7pkQCh17M=; b=uGbDyyxN3h27MtaFMlgxhcn5xTkA/9/ibXs5/WrujlpWTkoMxBygTygsmz7ZRT9AUq qqn2+MhZI8u69JGlMbQ49IMSYonsYk8roNg8bJTNtJFKkrklxqKnbrHLjJnULTwNEt9g 6Ns8mdPYFssv0I5E+fENzxjiY+sXeNOSrCnYID0/AFWkb3oIq3t85kmM7eu9LM97AnEo s5XIOd9qCwC92wuqNP6l9Agc5b+tCyN/PTonrWq7YzxS29EdZq+lVzwVSvCbVXIoeexr NFS289EutHHdD2fK3NRpiWXKif5/fNjfv1AgmzVblx1fVj++V3EIdHiJ7GUbasfgrTtD sm9w== X-Gm-Message-State: AOUpUlHCprMuV0IN62J8jtMtLVIJdAuqYsUIexJCvZq+vfWhW0pChFMc 7osEBw8QEX+nN01RxoMfphc= X-Google-Smtp-Source: AA+uWPw/FJi/TvFToKrJKDhN5hGqZXc6h7ZpwyiFpKJT+GaqjStlToCVyP8WXA2et8u9NTVnsk8ZlA== X-Received: by 2002:aa7:d4c1:: with SMTP id t1-v6mr47967209edr.121.1534608286420; Sat, 18 Aug 2018 09:04:46 -0700 (PDT) Received: from localhost.localdomain (109-252-90-13.nat.spd-mgts.ru. [109.252.90.13]) by smtp.gmail.com with ESMTPSA id r44-v6sm4835256edd.87.2018.08.18.09.04.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 18 Aug 2018 09:04:45 -0700 (PDT) From: Dmitry Osipenko To: Thierry Reding Subject: [PATCH v1] drm/tegra: plane: Permit tiling modifiers Date: Sat, 18 Aug 2018 19:03:57 +0300 Message-Id: <20180818160357.7476-1-digetx@gmail.com> X-Mailer: git-send-email 2.18.0 X-Mailman-Approved-At: Sun, 19 Aug 2018 16:08:08 +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, 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 Tiling modifier can't be applied to overlay planes because all tile modifiers are filtered out. Fixes: e90124cb46bdb ("drm/tegra: plane: Support format modifiers") Signed-off-by: Dmitry Osipenko --- drivers/gpu/drm/tegra/plane.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/tegra/plane.c b/drivers/gpu/drm/tegra/plane.c index d068e8aa3553..cd6f7116d8f6 100644 --- a/drivers/gpu/drm/tegra/plane.c +++ b/drivers/gpu/drm/tegra/plane.c @@ -76,13 +76,17 @@ static bool tegra_plane_format_mod_supported(struct drm_plane *plane, uint32_t format, uint64_t modifier) { - const struct drm_format_info *info = drm_format_info(format); - - if (modifier == DRM_FORMAT_MOD_LINEAR) - return true; - - if (info->num_planes == 1) + switch (modifier) { + case DRM_FORMAT_MOD_LINEAR: + case DRM_FORMAT_MOD_NVIDIA_TEGRA_TILED: + case DRM_FORMAT_MOD_NVIDIA_16BX2_BLOCK(0): + case DRM_FORMAT_MOD_NVIDIA_16BX2_BLOCK(1): + case DRM_FORMAT_MOD_NVIDIA_16BX2_BLOCK(2): + case DRM_FORMAT_MOD_NVIDIA_16BX2_BLOCK(3): + case DRM_FORMAT_MOD_NVIDIA_16BX2_BLOCK(4): + case DRM_FORMAT_MOD_NVIDIA_16BX2_BLOCK(5): return true; + } return false; }