From patchwork Tue Aug 21 18:30:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandru-Cosmin Gheorghe X-Patchwork-Id: 10572291 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 A68C51803 for ; Tue, 21 Aug 2018 18:31:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8CAF52AD9F for ; Tue, 21 Aug 2018 18:31:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8A5A22AD85; Tue, 21 Aug 2018 18:31:11 +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=BAD_ENC_HEADER,BAYES_00, 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 2D5202AD58 for ; Tue, 21 Aug 2018 18:31:10 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C98B56E319; Tue, 21 Aug 2018 18:31:08 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-eopbgr70087.outbound.protection.outlook.com [40.107.7.87]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8A9DB6E319 for ; Tue, 21 Aug 2018 18:31:07 +0000 (UTC) Received: from e114479-lin.cambridge.arm.com (217.140.106.49) by AM5PR0802MB2548.eurprd08.prod.outlook.com (2603:10a6:203:a1::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1059.23; Tue, 21 Aug 2018 18:31:00 +0000 From: Alexandru Gheorghe To: seanpaul@chromium.org, airlied@linux.ie, dri-devel@lists.freedesktop.org, liviu.dudau@arm.com, brian.starkey@arm.com, malidp@foss.arm.com, gustavo@padovan.org, maarten.lankhorst@linux.intel.com, ayan.halder@arm.com, daniel.vetter@ffwll.ch Subject: [PATCH v2 3/5] drm/i915: Set tile sizes in drm_format_info Date: Tue, 21 Aug 2018 19:30:02 +0100 Message-Id: <20180821183004.6775-4-alexandru-cosmin.gheorghe@arm.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180821183004.6775-1-alexandru-cosmin.gheorghe@arm.com> References: <20180821183004.6775-1-alexandru-cosmin.gheorghe@arm.com> MIME-Version: 1.0 X-Originating-IP: [217.140.106.49] X-ClientProxiedBy: MWHPR2001CA0020.namprd20.prod.outlook.com (2603:10b6:301:15::30) To AM5PR0802MB2548.eurprd08.prod.outlook.com (2603:10a6:203:a1::21) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6dc1c704-ca18-4c9c-ff44-08d60794413e X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM5PR0802MB2548; X-Microsoft-Exchange-Diagnostics: 1; AM5PR0802MB2548; 3:E/HYDcRilcUpc5SCy0tPq/NKiPAuGgjAgKmSbHBs10CeCjg9lG5qDaNJ7CBrBsCen6ZHgO4O4QP0/kxdXwAJLb+RLzGbkuMFCnS2TvopabfhsZBWq9DRh312Idq9jF7wAynNCA3IlIEzmKfuCkhoSXb2dZoRHGRS9Fiy1FGPAPUBloLwNtRCYtDemI2stqo3svKhyuPXjwkZn/vMAisF2mn6MoHnbuWKpga9NDduEWHnYtAPQp22BEPKde+XO5mo; 25:hJEP/1sAbqs8jk5sXSsQD9ZIuvrXwACEkFZVTb64dUnFNtw3mp5H+V63nD2TNugNRoQOkX0MCyNge69xvzJ+9x6EpXPeLD8Bq/T9i07GBerpMoFWTlhHef6tvQsm2rn9I40o9qVK+jhd7SykncMj7rH7eLLgQ850oyo4jbzlvs9SZeQ+x82L0Lt0/Rv1Obtgmi0yZtt6VYGXyIDBLhspkWbf0ICugNgTJ5GYWPn1WCLWFwNz7aK+ksVQ/JYSG9k9M3o2iiSNR8HUr3XHOLjWn2tr+YIMAjtr5HL0ZB8BKUyE+oCC7Dbb1G5UCDizu/ehVH/6/DFNQRFxbBpU1ZN+hQ==; 31:hcOO8eo/8cxkqqia0C2zWNfTrNHEjtNXDWF5Vgf8tb4CQUCYKjGo4Oj4/SDWKUkDfOPQgNUanD2iGlhbi3+qX1cY+d+TT4Q7Yz5bdBx337LnAN9ZNDO+6DD5G4g4L6jgH2napPSbRzGGw6HNiUjuGiikBTfAk5SV/96y/aXVpBc0h4Sn3LiC7o6xUz6ELX7wxFVaef5o/BDZIDkcsFfanVYnNU/GllGtnep5U4Q+uVo= X-MS-TrafficTypeDiagnostic: AM5PR0802MB2548: NoDisclaimer: True X-Microsoft-Exchange-Diagnostics: 1; AM5PR0802MB2548; 20:roycsqyRrpXL0lSJ+lQvRoN54wxecsAwCIA3UMD8joEs1jqAKPI9rsGWArKSY8J67TJjBThRMGyNIyc1bd8QKkOxV/v2T6GTx1M1y2Xe+UjYQUSFnGZmGLbn0YK+M3441b3cEYwxjO/PaBJw9EzttGlBUVKPaodgYy3pAPcxd4yRrc9tasvTBQFB7wiV4Eh9ukB7p8E7E0FkkSYZOlleU+d6IKvlJvnb4YdcsWAWPIkc1u3WJLSyOJ18b5iMcIXZxVQoHmCayeOG8Xa0NUTHYKTviFpXu2rMtONUyWJZe//v7v55HWDYWTLuPgqE3QkNOqHqxOuC3sU3TN3p6ttxtQ==; 4:oIB0CXkHuP8j6h1TKKN3JqBBdv4ry8SoSkiwkobreeoEsWGcwZQEyVgJ45OcVJERqk8Hh3kKRKhHr/HGMW+pHCGzRaptuCnT3CCfNXFZrS9w0lTt3edCvICPDXG/CWLA3uYgU7SptZIdEoe4lQNMrHX+gyNbHNc4nQcmv4tWGLkWCz2aQEQTpUKYt9CCGcKruhSryHUFrspEmu6SDWTnegiXVYGRHYp0ndqtV4eXhhjjpO0/l8w5IWnY7MXUkEShUjHJDL2OVqUl41A/doGPzHhNvfHuIOwid0LVkeX6DeU3Jls9sjvUrS1CovDHxGQo X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(180628864354917); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(823301075)(3002001)(10201501046)(3231311)(944501410)(52105095)(93006095)(93001095)(6055026)(149027)(150027)(6041310)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(20161123564045)(201708071742011)(7699016); SRVR:AM5PR0802MB2548; BCL:0; PCL:0; RULEID:; SRVR:AM5PR0802MB2548; X-Forefront-PRVS: 0771670921 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(346002)(39860400002)(136003)(396003)(376002)(366004)(189003)(199004)(8676002)(68736007)(72206003)(97736004)(50226002)(36756003)(106356001)(53936002)(105586002)(47776003)(16586007)(316002)(6116002)(66066001)(2906002)(86362001)(8936002)(3846002)(478600001)(4326008)(1076002)(25786009)(6486002)(7736002)(81156014)(81166006)(476003)(76176011)(50466002)(26005)(186003)(11346002)(2616005)(48376002)(51416003)(486006)(7696005)(956004)(52116002)(446003)(386003)(16526019)(5660300001)(305945005)(921003)(1121003); DIR:OUT; SFP:1101; SCL:1; SRVR:AM5PR0802MB2548; H:e114479-lin.cambridge.arm.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: arm.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM5PR0802MB2548; 23:GcP2+2q+TPHcGRhseneqDKK9hxVK7ViEdwOaX8I?= 5+G8EjHdSelZi3J2JsDMrVna+dyAFQFR0uLdYtmsdIjW2baBj0/TBU00s1ZlF2NgnjrpiKPEQbjOp0AORdHxOTJkYdr/jExPjLfcTSTI1u2l+kTWjEOKNiidFNJymhrIpgL1ieWHqo5+lW6qT+lWAIVA7njehA5g4CPt21xM3FCjDPhg62mJMLG4283AoO5Z84SCAb0DoI1n7YKGBlNWDF6ItT2r+7hHrVCMtUlcxn/mMt+xZ1WXbDM9pWFr4nbJPFayGNCITQBXoejEIZbgV/8vATEQWSTPvgwW7xRt07FVLh9ylxt1VG96zUvBjRJv2kA7SBHO5IN6p/4sJ2nRoY12QBnKu+ALgaPtwlw4uFYPU0DwBFhKnIlUXTTkiHdR7llYrxB2rZDWb+S29fA/GmF53A/3FZlVs6VCRGflpjrtem86KpXE7BTt230OE9x7A2eF9sBV/pS9hIsEd4zyk1q8GD5a6oKmZivdjKapFCxah7XBh9eZly2EHKStAfdxT/i9DhDrykxwJjJZnVONfEQUaXT9iXeQTCbdCo2ipiRPN9oXNTiHPT4a9gvQq23eJck4qEQXUQ0c1j5kSbRm54H107IaLUznlvwLGC37Mn55mKus0gzOTerCjm6ttItD95C8W+ep2749eV8ikTZ9TwGSzoJHPr9z5PkHOBmvxsPMX19qau79hNBmfJdhHcpNsPA1r4EsxqxAbYZW/1iH9ed4zJ3iY/Ja7Nz9MN2qC8/c8yUFsu9f0jphciIGC2FVz/Ij4FcV73rtmivxG6IeYHilYTQ45LaJj9Jzk+FCrHHXc0fRVlrSoRZm7I1j/GsDIJNe3Y99+HMC4tkQiBu0wo5OY7mNmFQkaWQQeNPfhT6bWXhLm/pfBFp3Rpgm6Rsqez/mzo/QU6+56j0F7paBXFxQTbGtl9XvVMQi9qfy0Mtb+rnlmTIGZ7TCPKt82obRZbMZ5dqfrKEtXaeIiJjcUL9dUCWGp/Yx8TgdT1o+W/PQK7pA14LMX0QHtMqEMfG7leAMMBXVFoNVlLaiMGarK6+h06GUM26mEJHBPiJmDodUSgMVZpvAsRJ0Z1Ux2Y5H6VRwHxxs2PgQd7z5de79P3i+h8HbOTln5nMZoJiAAB1wgxmDobGMrxbG9BFAVfAmnPlo= X-Microsoft-Antispam-Message-Info: fETdR/JNTamhb//In7BPWPZ3TX3kcjc73xE/KfgS4ayWz8rraAFqttcSLuuXpyjNXzvy83bq/gwjz+w9phSu6z/zbxZQMlgBGPRQb5ieAtHjmbthZ7TQ4O5gdjAOiuKYTWN1ApL81dR9w/IE0BQk/GfHl3vlvZrUKJCFq1si1TlPZXQuttk5JljGYEHiYcd/difSPgFnu0n7lz2O9LJZZorV6cud4JuRbcCoVkvQysaSlOhTIKB34icpZVr75b8jUZm07Ns407aHBjA5t/+5y6OYBjtfCuZQAGZl0Jp25G9m8T82RHK/5cPYHIzJtaJL1hHcq65bVQgq8hwvLJoFPtjKXyxnYtEUs+uyNBk7/0I= X-Microsoft-Exchange-Diagnostics: 1; AM5PR0802MB2548; 6:+gS1E027RH0GBoWdDy/U988clZDJEcRMRL1t7IUlSHofJrOxWrwndpGk42vdq13xWI/1fdzb18jP0hgVEPHdcx+aSo6czmuVjmAsPWDce0iahdAWN39ujKpZAQJ8TiHRGIJfWfQbilrv3ucuG1xOi+KLaGbVVPmfxak35k2bUTCnHKKf1Q46R2/R5XsT6ipFh4b6S7cN8f4zIZKpWodvMkorK+tV3cXERRlqrl7sSkp1TDNSbn4TnSHEsRTQ7w2LYEbWYrRbvFiiAIFBD5B0DAqleAt5QIr0+xGZpHpjVG1W+sOCrjl1wVY3AcZx3xFs/ujhd1QGdHnECTxQ0AvmGWs+8HbtlPISNYCNfvCWlD4ogZ1fOH2q0iZj9Mlf4ilhu1kB2dTdiyboqI1BPreuv6KbQdTo6UkKJsZASoweoVvxncuKgXN5lZNvBVgyxzgLBNVoUrhBQH8qY08Fq2L8Xg==; 5:vHDhD+PK6uUhV/Cp6sfsFS9xPAyr01H8Azo6ehd6X67K1xcCEAz/kW9Zs9OSYYUIxlQvNGdBJMc3ynPrMG/nhgNS7/9zY3uFp9CuVLzf41ukfi+H0u0N31Qz6d6ZcIipZAhnPzMTnP0VGLGxgk7zcoo6e/8HZxhHPN/5Lh5Tu3Q=; 7:ZohVXqkSa7WeHpDXnp1Y3rpTBPpFAAaf6qb7iurkrNgvgN6/6r3YlLj+syeJ+N/2Ft7Sx9FjsChmEJTj5qtUd7Qp9GP0EmLVfoYJ96LA+838bRWCV/FOtOKeEiPMS0Xxi1Wtg0KeUjTJif5mv7DJ/IONkAIA8EJtE15Y/YfftfsvsgBf2LP4aklrtkfiAGItGGSWYDpxp9G/ikMftFdNDFDPBTot8MLr3D9vdAOUbhyp1M2QRPVSSRqTfb3Kpsa+ SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Aug 2018 18:31:00.8980 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6dc1c704-ca18-4c9c-ff44-08d60794413e X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0802MB2548 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: nd@arm.com, Alexandru Gheorghe Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Two new fields had been added to drm_format_info struct, tile_w and tile_h, this need to be set to 1 for all non-tiled formats. Signed-off-by: Alexandru Gheorghe --- drivers/gpu/drm/i915/intel_display.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index bd8956f2544d..fdc679e9dfa3 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -2440,10 +2440,14 @@ static unsigned int intel_fb_modifier_to_tiling(uint64_t fb_modifier) * main surface. */ static const struct drm_format_info ccs_formats[] = { - { .format = DRM_FORMAT_XRGB8888, .depth = 24, .num_planes = 2, .cpp = { 4, 1, }, .hsub = 8, .vsub = 16, }, - { .format = DRM_FORMAT_XBGR8888, .depth = 24, .num_planes = 2, .cpp = { 4, 1, }, .hsub = 8, .vsub = 16, }, - { .format = DRM_FORMAT_ARGB8888, .depth = 32, .num_planes = 2, .cpp = { 4, 1, }, .hsub = 8, .vsub = 16, }, - { .format = DRM_FORMAT_ABGR8888, .depth = 32, .num_planes = 2, .cpp = { 4, 1, }, .hsub = 8, .vsub = 16, }, + { .format = DRM_FORMAT_XRGB8888, .depth = 24, .num_planes = 2, .cpp = { 4, 1, }, + .hsub = 8, .vsub = 16, .tile_w = 1, .tile_h = 1 }, + { .format = DRM_FORMAT_XBGR8888, .depth = 24, .num_planes = 2, .cpp = { 4, 1, }, + .hsub = 8, .vsub = 16, .tile_w = 1, .tile_h = 1 }, + { .format = DRM_FORMAT_ARGB8888, .depth = 32, .num_planes = 2, .cpp = { 4, 1, }, + .hsub = 8, .vsub = 16, .tile_w = 1, .tile_h = 1 }, + { .format = DRM_FORMAT_ABGR8888, .depth = 32, .num_planes = 2, .cpp = { 4, 1, }, + .hsub = 8, .vsub = 16, .tile_w = 1, .tile_h = 1 }, }; static const struct drm_format_info *