From patchwork Sun May 30 19:55:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Osipenko X-Patchwork-Id: 12288435 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 586F4C47091 for ; Sun, 30 May 2021 19:56:45 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 02F1D6120E for ; Sun, 30 May 2021 19:56:44 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 02F1D6120E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7D0F96E3D6; Sun, 30 May 2021 19:56:44 +0000 (UTC) Received: from mail-lj1-x22f.google.com (mail-lj1-x22f.google.com [IPv6:2a00:1450:4864:20::22f]) by gabe.freedesktop.org (Postfix) with ESMTPS id 87C096E3D6 for ; Sun, 30 May 2021 19:56:42 +0000 (UTC) Received: by mail-lj1-x22f.google.com with SMTP id a4so5473577ljq.9 for ; Sun, 30 May 2021 12:56:42 -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:mime-version :content-transfer-encoding; bh=D81tkCGvXzSWAObvwaaOuSmUSpOoTX5y4oeB4l92ReY=; b=BLEX8CY4gexNiThfWiILWu6TCNAv3Ps/RTYWT3Z6aPpGd7b5PndGFEU3bnMJCOOKQV /u16Pep+mpJdLq8JuKwkTFMuMIcUI4KSDv6B8VF2pHIQFY19ySlbvPxGD77KevNURFvd xgl4NZtvcn+HCIOJKpDdiBylUrxhKw+z9GaGtf2ThE5Mh7RtA9AtBH14lbcjpSaKnwbK lB9aWQhpL4K5OlTT+Mrhp5smRvc7GHpXUxJDA/3Mk9pgnwrrjWV0Hpex6GCwxilL8etu yDH9X3CHhdFJptWTUOwzNtW9P2v1vTE4KV7vEPOlSW+/dTAApr7QqKKGRM48OMSMcOSS 7+1Q== 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:mime-version :content-transfer-encoding; bh=D81tkCGvXzSWAObvwaaOuSmUSpOoTX5y4oeB4l92ReY=; b=Q3ocO1bMDcaMdaZ5BgWUZ6moperAnIzurjvDJ4WslADzOnnwCpbzSx+ScjP9DxTh6O hPZ6YCegko22bz7CXQBg11xfk31L+g1AI3UyD/RAJc4vasUm2P66pMscHC/ZNc6zlj3i aAxcgJpcwh5Ad99+r8zEKlgmnDljHv+w0CLR0Cg2PvPbjMDBU4ozz3s5jAhT1F2v2Pbg piscXdbinTAdbsD9du5GyaPyNyahMQImqtKRcaEGb7QbP+LdRKwQvBRrj7Zqi7tXCnIC bDr/jv3IwCOzxR9JAJiF0rnlrb2XpyPtsZpM6GTqlfs5T1pm8w2Z6f2ij3Ph1w4MEf82 HpPA== X-Gm-Message-State: AOAM532sYBtYugMjAgKEzhp1Qw/0XUV/F79NDPmmu0r+16FTj/rZ+Xag tGrWU9h5kjErJn1+yzEJDupSJ0BGo+0= X-Google-Smtp-Source: ABdhPJwfr39KewKZkvjI8u/JePNezVfJTcOSzxX02pjxKhqCnMhaT+T4nfJ5zOmjtn00KBp2QEne1A== X-Received: by 2002:a2e:8797:: with SMTP id n23mr14210761lji.248.1622404601004; Sun, 30 May 2021 12:56:41 -0700 (PDT) Received: from localhost.localdomain (79-139-170-222.dynamic.spd-mgts.ru. [79.139.170.222]) by smtp.gmail.com with ESMTPSA id z20sm1332398ljz.33.2021.05.30.12.56.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 May 2021 12:56:40 -0700 (PDT) From: Dmitry Osipenko To: Thierry Reding , Jonathan Hunter , Mikko Perttunen Subject: [PATCH v1] drm/tegra: Correct DRM_FORMAT_MOD_NVIDIA_SECTOR_LAYOUT Date: Sun, 30 May 2021 22:55:06 +0300 Message-Id: <20210530195506.19124-1-digetx@gmail.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 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 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" The format modifier is 64bit, while DRM_FORMAT_MOD_NVIDIA_SECTOR_LAYOUT uses BIT() macro that is 32bit on ARM32. The (modifier &= ~DRM_FORMAT_MOD_NVIDIA_SECTOR_LAYOUT) doesn't work as expected on ARM32 and tegra_fb_get_tiling() fails for the tiled formats on 32bit Tegra because modifier mask isn't applied properly. Use the BIT_ULL() macro to fix this trouble. Fixes: 7b6f846785f4 ("drm/tegra: Support sector layout on Tegra194") Signed-off-by: Dmitry Osipenko --- drivers/gpu/drm/tegra/drm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/tegra/drm.h b/drivers/gpu/drm/tegra/drm.h index 87df251c1fcf..0cb868065348 100644 --- a/drivers/gpu/drm/tegra/drm.h +++ b/drivers/gpu/drm/tegra/drm.h @@ -25,7 +25,7 @@ #include "trace.h" /* XXX move to include/uapi/drm/drm_fourcc.h? */ -#define DRM_FORMAT_MOD_NVIDIA_SECTOR_LAYOUT BIT(22) +#define DRM_FORMAT_MOD_NVIDIA_SECTOR_LAYOUT BIT_ULL(22) struct reset_control;