From patchwork Thu May 4 10:28:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juha-Pekka Heikkila X-Patchwork-Id: 13231009 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 2FD1BC77B7C for ; Thu, 4 May 2023 10:28:21 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 43E5D10E421; Thu, 4 May 2023 10:28:20 +0000 (UTC) Received: from mail-lf1-x12e.google.com (mail-lf1-x12e.google.com [IPv6:2a00:1450:4864:20::12e]) by gabe.freedesktop.org (Postfix) with ESMTPS id B6EAB10E421 for ; Thu, 4 May 2023 10:28:18 +0000 (UTC) Received: by mail-lf1-x12e.google.com with SMTP id 2adb3069b0e04-4f00c33c3d6so347120e87.2 for ; Thu, 04 May 2023 03:28:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683196096; x=1685788096; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=jEBRUwDLpFcnXrlbigezC2oCjVBKtjOYIID+uAK03II=; b=e/FgJRw8f6WfrB6YMwlxVlh9QADotisTsB1L2B7pXL0GACDFZzdzcpf8BOORdtCY3Y ly59hiK8X/1ChOpqHEMrteqMRZNDYoVUSl2xtXIyfEdzW9WjVss7QUutGahYiExIJJks QmRTKoEDIpL/XnAs+DgaxsxamkbgadkbLzThD7aJ/lU9L6oAVNdVD+iGlBskScJ6lTvR PuNq+Zfao6mypJzSLVZWa6r/qeRcyRtHRPl/7HMyNHuG0ypLHKZExHa9r9+n6yWAS21r gll+4KYhBmn/5NTiR3Yxqck9NZRQvSwTfhBIKRvBUtxkPtPw8rmEDw97laDQ9clCPge6 PlDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683196096; x=1685788096; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=jEBRUwDLpFcnXrlbigezC2oCjVBKtjOYIID+uAK03II=; b=JVt6Jq1Q5DyEYFrRfFp2YoiSfvT47kY7UIl8AWxoGB7YYnZLdAVsl3AP+vNV8lOzAF 9rQwdYeB90vOVteYCQEtx8lBH+HPDIjBNVY54oLG3i1689NXJITv6QvML34nVB+WiSyM VyKAP+yZkOQgYhV1O8MBKzHgZZN9RTCJ0sGD/nkv8RTIZNvwPewx+ETZy7AGW0qWg668 JgUN+16sJBfwCjmgTfiROPZCOujaMFIwbi9RSvzmM2dRQLSOJr8SciQLJ+wDYpUV0Axp oqC/Hw3BJ4okWVBCxQChbeUKpcxq81Pbu9MkcmcVYfSge4fvXCkYcdygwNXu4dvD5Udv BdPQ== X-Gm-Message-State: AC+VfDyLXPzhLu6rkafTpIda3tQTEhq94w8IAb1+egF6Q1ncjEzQl76m NC/W/++6YqQth8pfwd1gGByiSLdprb5vh9of X-Google-Smtp-Source: ACHHUZ41VvAUUN+BN2N9eXUvf4+ZTyrTJivN+cK8/0Ym6H62zp5CNFyXz2Bid7uSInWTRd/snH7kpw== X-Received: by 2002:ac2:5142:0:b0:4ef:ed49:fcc2 with SMTP id q2-20020ac25142000000b004efed49fcc2mr2147517lfd.26.1683196095550; Thu, 04 May 2023 03:28:15 -0700 (PDT) Received: from localhost.localdomain ([2001:998:22:0:60cb:8180:a416:f400]) by smtp.gmail.com with ESMTPSA id v25-20020a056512049900b004eff32d6a21sm5097416lfq.121.2023.05.04.03.28.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 May 2023 03:28:14 -0700 (PDT) From: Juha-Pekka Heikkila To: intel-gfx@lists.freedesktop.org Date: Thu, 4 May 2023 13:28:02 +0300 Message-Id: <20230504102805.18645-1-juhapekka.heikkila@gmail.com> X-Mailer: git-send-email 2.40.0 MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH 1/4] drm/i915/mtl: Drop FLAT CCS check X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Pallavi Mishra Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" From: Pallavi Mishra Remove FLAT CCS check from XY_FAST_COLOR_BLT usage, thus enabling MTL to use it. Signed-off-by: Pallavi Mishra Signed-off-by: Juha-Pekka Heikkila Reviewed-by: Nirmoy Das Reviewed-by: Andrzej Hajda Reviewed-by: Andi Shyti --- drivers/gpu/drm/i915/gt/intel_migrate.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/gt/intel_migrate.c b/drivers/gpu/drm/i915/gt/intel_migrate.c index 3f638f198796..e0998879a0e1 100644 --- a/drivers/gpu/drm/i915/gt/intel_migrate.c +++ b/drivers/gpu/drm/i915/gt/intel_migrate.c @@ -920,7 +920,7 @@ static int emit_clear(struct i915_request *rq, u32 offset, int size, GEM_BUG_ON(size >> PAGE_SHIFT > S16_MAX); - if (HAS_FLAT_CCS(i915) && ver >= 12) + if (GRAPHICS_VER_FULL(i915) >= IP_VER(12, 50)) ring_sz = XY_FAST_COLOR_BLT_DW; else if (ver >= 8) ring_sz = 8; @@ -931,7 +931,7 @@ static int emit_clear(struct i915_request *rq, u32 offset, int size, if (IS_ERR(cs)) return PTR_ERR(cs); - if (HAS_FLAT_CCS(i915) && ver >= 12) { + if (GRAPHICS_VER_FULL(i915) >= IP_VER(12, 50)) { *cs++ = XY_FAST_COLOR_BLT_CMD | XY_FAST_COLOR_BLT_DEPTH_32 | (XY_FAST_COLOR_BLT_DW - 2); *cs++ = FIELD_PREP(XY_FAST_COLOR_BLT_MOCS_MASK, mocs) | From patchwork Thu May 4 10:28:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juha-Pekka Heikkila X-Patchwork-Id: 13231010 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id DDB4DC77B7C for ; Thu, 4 May 2023 10:28:24 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2393610E424; Thu, 4 May 2023 10:28:24 +0000 (UTC) Received: from mail-lf1-x12a.google.com (mail-lf1-x12a.google.com [IPv6:2a00:1450:4864:20::12a]) by gabe.freedesktop.org (Postfix) with ESMTPS id E57C310E425 for ; Thu, 4 May 2023 10:28:21 +0000 (UTC) Received: by mail-lf1-x12a.google.com with SMTP id 2adb3069b0e04-4eed764a10cso355579e87.0 for ; Thu, 04 May 2023 03:28:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683196099; x=1685788099; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+MlPGmqnMWjfVdndrwJb0nfPY3ABmvvSgvtmgY2NyW4=; b=VcCZXAWmbPxw1w0X5HzZnHS8fPHW0lzpLmwPRDJtKCvXIqFXczuC5j+HK8ABSZznoc FSUj5B7NkxUtXfyyQJ+V8JsoZaDnFji5PRTsf7IDD0CCoBXv1oWnoEpF2MAhmPxrRirp llNcHdeyQvdcP6vW04GXpKNwTCOyGTY9fQ0sRubtNJ8uPLhPG8fMKrq2+IqQxb3n0moJ XmfG/ZNHTaC5QIBSA4i/llzILH/0kltpzLfWHSn6ZgQN4oQ/efeGLHOWcW2jKBtwMb47 kMnl5oad2+7j1pMM5uvWsg8qsds7uxldkLeJmOm4MOukAS6AVym7nuw9Bi6mPPBKtK1h yBYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683196099; x=1685788099; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+MlPGmqnMWjfVdndrwJb0nfPY3ABmvvSgvtmgY2NyW4=; b=lbK7DqYRyYmguQwnRCS8bX5NJpu4ZNqDbFS1mh543vgYEKqTfSPP9sofUE5xy/sxsL jmskLz0UVl45yAdtXSg7et7vVvHlCO5TOaX4ATRVRZSgQb2lC0l4vEGpbk2B7ZtEVs7k HBc0QGlHQIePPgRszwZ0sQSYvw/FPJ1JPKwnD4bdKXrwiPdJzhyNGMFtDljGZiEOReKh hpj7m3Q8abSZZMfpSZDOSiVNcdhuhaE15fuV+JME9OuO9+iHzUurSpH1+0ao6YIqhCZu jOP2e9uhfQNgAALFoOjYz1JZeFkN0pPNbFbUFjTPrtVYgx9+7dejymW+ub++VkXAMj8o 8g+A== X-Gm-Message-State: AC+VfDwSScIfd3Ju2yoRAt/GtITMyPxYIA6Hvfq1x9Jriu60u6xd+1uX 4hm8u079MqLdqahikNsj/KFy+6ZopPNaZyLU X-Google-Smtp-Source: ACHHUZ58ponsiVXQRAJsHoovsj0avl2NPVlQMJboDM3gTVGYBKmjeG0TJe2bc2izg7MPJQYp7VZa7g== X-Received: by 2002:a19:a402:0:b0:4f1:44c0:a921 with SMTP id q2-20020a19a402000000b004f144c0a921mr366534lfc.55.1683196099106; Thu, 04 May 2023 03:28:19 -0700 (PDT) Received: from localhost.localdomain ([2001:998:22:0:60cb:8180:a416:f400]) by smtp.gmail.com with ESMTPSA id v25-20020a056512049900b004eff32d6a21sm5097416lfq.121.2023.05.04.03.28.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 May 2023 03:28:18 -0700 (PDT) From: Juha-Pekka Heikkila To: intel-gfx@lists.freedesktop.org Date: Thu, 4 May 2023 13:28:03 +0300 Message-Id: <20230504102805.18645-2-juhapekka.heikkila@gmail.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230504102805.18645-1-juhapekka.heikkila@gmail.com> References: <20230504102805.18645-1-juhapekka.heikkila@gmail.com> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH 2/4] drm/i915/mtl: Add MTL for remapping CCS FBs X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" From: Clint Taylor Add support for remapping CCS FBs on MTL to remove the restriction of the power-of-two sized stride and the 2MB surface offset alignment for these FBs. Signed-off-by: Clint Taylor Signed-off-by: Juha-Pekka Heikkila Reviewed-by: Radhakrishna Sripada --- drivers/gpu/drm/i915/display/intel_fb.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_fb.c b/drivers/gpu/drm/i915/display/intel_fb.c index e5f637897b5e..c004f08fcfe1 100644 --- a/drivers/gpu/drm/i915/display/intel_fb.c +++ b/drivers/gpu/drm/i915/display/intel_fb.c @@ -1190,7 +1190,8 @@ bool intel_fb_needs_pot_stride_remap(const struct intel_framebuffer *fb) { struct drm_i915_private *i915 = to_i915(fb->base.dev); - return IS_ALDERLAKE_P(i915) && intel_fb_uses_dpt(&fb->base); + return (IS_ALDERLAKE_P(i915) || DISPLAY_VER(i915) >= 14) && + intel_fb_uses_dpt(&fb->base); } static int intel_fb_pitch(const struct intel_framebuffer *fb, int color_plane, unsigned int rotation) @@ -1326,9 +1327,10 @@ plane_view_scanout_stride(const struct intel_framebuffer *fb, int color_plane, unsigned int tile_width, unsigned int src_stride_tiles, unsigned int dst_stride_tiles) { + struct drm_i915_private *i915 = to_i915(fb->base.dev); unsigned int stride_tiles; - if (IS_ALDERLAKE_P(to_i915(fb->base.dev))) + if (IS_ALDERLAKE_P(i915) || DISPLAY_VER(i915) >= 14) stride_tiles = src_stride_tiles; else stride_tiles = dst_stride_tiles; @@ -1522,7 +1524,8 @@ static void intel_fb_view_init(struct drm_i915_private *i915, struct intel_fb_vi memset(view, 0, sizeof(*view)); view->gtt.type = view_type; - if (view_type == I915_GTT_VIEW_REMAPPED && IS_ALDERLAKE_P(i915)) + if (view_type == I915_GTT_VIEW_REMAPPED && + (IS_ALDERLAKE_P(i915) || DISPLAY_VER(i915) >= 14)) view->gtt.remapped.plane_alignment = SZ_2M / PAGE_SIZE; } From patchwork Thu May 4 10:28:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juha-Pekka Heikkila X-Patchwork-Id: 13231011 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 09878C7EE23 for ; Thu, 4 May 2023 10:28:27 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7B47F10E425; Thu, 4 May 2023 10:28:26 +0000 (UTC) Received: from mail-lf1-x134.google.com (mail-lf1-x134.google.com [IPv6:2a00:1450:4864:20::134]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1963810E425; Thu, 4 May 2023 10:28:24 +0000 (UTC) Received: by mail-lf1-x134.google.com with SMTP id 2adb3069b0e04-4f13a72ff53so355995e87.0; Thu, 04 May 2023 03:28:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683196103; x=1685788103; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=7dDW6YW9g+BSy8J6K3KPtt7xboSismIsEGXDGzqEbfU=; b=ns4KDTuwcm3ZEZVHwP6j2ajVfMV7gUe4R9Grb3auZC5RsjrsdjxbGQOK6f+zvKUgk2 o3T7kwayBrCZz9sw6oVEx/sE3Y0I4qp8I4dVCkp77qIEvQwXMb5T4P5DiEkBRqLS/Osb 2XfPXbcGpKdR4ZosQ8PfsGdydexj5MnkyX8/hHFllicQ1CR8M5BLaGmC3/6qFPk6QKLX 4+mESudou+shXAdLnm8HdXpA7JIPh/G1UGao56ylCE90dTOifNGi/NWw/H413hH2Bn4y RmuFdK3QVGmlZBJ5TeP8H+bmv/IVtTm8+7jlL/qptUo/yirOEXsokpJ201HdIS5wq0u7 F0TA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683196103; x=1685788103; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7dDW6YW9g+BSy8J6K3KPtt7xboSismIsEGXDGzqEbfU=; b=TL7JCyQi/lz4taei8UFeI7B66nox8nZ1MmcqrPtfW8W+3+kTFvClDZmXYeQJpqTLPx riFl0TOVAhlmMKgP7JEtYA8o2W19OFlDa+q0UsQSn8WBlsw+fxoCjeq1hHufztTrfoC2 +DrICKdZf81Cfu9UfORnNCZdiRFqW9InSn9deqFx+06Wq4/uzDREieN3Ty1OfwglIsOG fHOW0egog64NodOXYxeVxn92YPY0zQADIyn0gNEcSsLdsuNcqtlg7MyABBnSS9zybfmK Mja3EvD5yms7qvrzOmrzTOzTaFy4jePjBcgN+gE3eW4jYJiFhvRqnafrkpkXJDlK2H2A FgRw== X-Gm-Message-State: AC+VfDxdkJdxEXYv+DB+4KLfrdP78rfHkGQA6bB/17qPiH16zQXizack BkdvBhRaCZpR+1lUtJQLCjT1IMcy+s9aU+m3 X-Google-Smtp-Source: ACHHUZ6V4W7xkXqXZstaTBazVEFBr4ldkyeCIBxgUGKswKy3bmjqSAFOF2BbfF9MWHHeiA5taBEc1g== X-Received: by 2002:ac2:44c5:0:b0:4dd:ac8d:671f with SMTP id d5-20020ac244c5000000b004ddac8d671fmr1487491lfm.34.1683196102590; Thu, 04 May 2023 03:28:22 -0700 (PDT) Received: from localhost.localdomain ([2001:998:22:0:60cb:8180:a416:f400]) by smtp.gmail.com with ESMTPSA id v25-20020a056512049900b004eff32d6a21sm5097416lfq.121.2023.05.04.03.28.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 May 2023 03:28:22 -0700 (PDT) From: Juha-Pekka Heikkila To: intel-gfx@lists.freedesktop.org Date: Thu, 4 May 2023 13:28:04 +0300 Message-Id: <20230504102805.18645-3-juhapekka.heikkila@gmail.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230504102805.18645-1-juhapekka.heikkila@gmail.com> References: <20230504102805.18645-1-juhapekka.heikkila@gmail.com> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH 3/4] drm/fourcc: define Intel Meteorlake related ccs modifiers X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: dri-devel@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Add Tile4 type ccs modifiers with aux buffer needed for MTL Cc: dri-devel@lists.freedesktop.org Signed-off-by: Juha-Pekka Heikkila --- include/uapi/drm/drm_fourcc.h | 43 +++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/include/uapi/drm/drm_fourcc.h b/include/uapi/drm/drm_fourcc.h index de703c6be969..cbe214adf1e4 100644 --- a/include/uapi/drm/drm_fourcc.h +++ b/include/uapi/drm/drm_fourcc.h @@ -657,6 +657,49 @@ extern "C" { */ #define I915_FORMAT_MOD_4_TILED_DG2_RC_CCS_CC fourcc_mod_code(INTEL, 12) +/* + * Intel color control surfaces (CCS) for display ver 14 render compression. + * + * The main surface is tile4 and at plane index 0, the CCS is linear and + * at index 1. A 64B CCS cache line corresponds to an area of 4x1 tiles in + * main surface. In other words, 4 bits in CCS map to a main surface cache + * line pair. The main surface pitch is required to be a multiple of four + * tile4 widths. + */ +#define I915_FORMAT_MOD_4_TILED_MTL_RC_CCS fourcc_mod_code(INTEL, 13) + +/* + * Intel color control surfaces (CCS) for display ver 14 media compression + * + * The main surface is tile4 and at plane index 0, the CCS is linear and + * at index 1. A 64B CCS cache line corresponds to an area of 4x1 tiles in + * main surface. In other words, 4 bits in CCS map to a main surface cache + * line pair. The main surface pitch is required to be a multiple of four + * tile4 widths. For semi-planar formats like NV12, CCS planes follow the + * Y and UV planes i.e., planes 0 and 1 are used for Y and UV surfaces, + * planes 2 and 3 for the respective CCS. + */ +#define I915_FORMAT_MOD_4_TILED_MTL_MC_CCS fourcc_mod_code(INTEL, 14) + +/* + * Intel Color Control Surface with Clear Color (CCS) for display ver 14 render + * compression. + * + * The main surface is tile4 and is at plane index 0 whereas CCS is linear + * and at index 1. The clear color is stored at index 2, and the pitch should + * be ignored. The clear color structure is 256 bits. The first 128 bits + * represents Raw Clear Color Red, Green, Blue and Alpha color each represented + * by 32 bits. The raw clear color is consumed by the 3d engine and generates + * the converted clear color of size 64 bits. The first 32 bits store the Lower + * Converted Clear Color value and the next 32 bits store the Higher Converted + * Clear Color value when applicable. The Converted Clear Color values are + * consumed by the DE. The last 64 bits are used to store Color Discard Enable + * and Depth Clear Value Valid which are ignored by the DE. A CCS cache line + * corresponds to an area of 4x1 tiles in the main surface. The main surface + * pitch is required to be a multiple of 4 tile widths. + */ +#define I915_FORMAT_MOD_4_TILED_MTL_RC_CCS_CC fourcc_mod_code(INTEL, 15) + /* * Tiled, NV12MT, grouped in 64 (pixels) x 32 (lines) -sized macroblocks * From patchwork Thu May 4 10:28:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juha-Pekka Heikkila X-Patchwork-Id: 13231012 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 61DD6C77B7C for ; Thu, 4 May 2023 10:28:31 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A003610E42E; Thu, 4 May 2023 10:28:28 +0000 (UTC) Received: from mail-lj1-x234.google.com (mail-lj1-x234.google.com [IPv6:2a00:1450:4864:20::234]) by gabe.freedesktop.org (Postfix) with ESMTPS id 202F210E426 for ; Thu, 4 May 2023 10:28:27 +0000 (UTC) Received: by mail-lj1-x234.google.com with SMTP id 38308e7fff4ca-2ac7c59665bso3609131fa.3 for ; Thu, 04 May 2023 03:28:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683196104; x=1685788104; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=yDTXQyB2x1Xr2bm5TQu8h8Acis1tHrXBVy5pCnUr2Lw=; b=Al2F6wyjFeQk3hyzmE2DVpz3A7SG7F6dA88oInqIHv3oftyHsBOPqeMq9MmAWzfXux DbEZt2ffA31buOs9CTNozAYg0PFsvSGCS/fRsonh/77D2nT30KwoANlUsnr9DmqJDM2s rVUwo67a9hS5nup2L56bDFPARioll68BtAiXRAF2dc1i6phdOqTQcKT+GzfXVdOuz4T8 8IDM4+w10C107glV8kQ818kZfZxy8CpH+5IDDcmDVLbdYvHXy+sp2aseqbYJWrpKWLLH A399bBvx6wtk4v+dKsAsaFrCtOGy5gjD4hWJ3ECEEl912+8+pqYLlaZP0BeIhBt1qJPF NZ4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683196104; x=1685788104; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yDTXQyB2x1Xr2bm5TQu8h8Acis1tHrXBVy5pCnUr2Lw=; b=Y5svA2KKqZXX1T1rhfB+GP8c7Eq7EZU85iwFMkeD70NnORwOL/5JZhPj9pbMolGn5r +jeUmeDlDiBjPv8f2e73jg4eSqKFu53esxk1juSk6xChltfE35M8EFdRXQFTtcO0e2/6 V5orH5K4xsfcuF+mRom1kar44O2jzZOpk1mmjZGrvRoyRAIjzem6eTeF/bnsqTWxx5sP XNoS6O/sDLzVUD+UsGcixCRSHRkXuWoamPHuGWBeCG5RzM1GRGajJFGN+PPvEN8qsqI0 wOW0VVIPPQmoci+qoZu6ACKPZ4jqr5r6wbDK9XWFfx9+YpuMrSDhDvjKHtL6Kf3Zzc1u gkbA== X-Gm-Message-State: AC+VfDzus/J8vvss7m5cj2StMGGUbRazLT8O8wTomEvnrv4pkM+h7rjJ 93iywwvFcLmr875HfRZTUMr3v/HCgrMDh7+b X-Google-Smtp-Source: ACHHUZ5UXvdIdMtpOJ2i1vU6Coy31r1SeK+p6y0Jb63f5ZbrAwcI5fEoDtHfnwRE/bZggwXWrBjXWg== X-Received: by 2002:ac2:5a03:0:b0:4f0:e2:c709 with SMTP id q3-20020ac25a03000000b004f000e2c709mr1567449lfn.17.1683196104346; Thu, 04 May 2023 03:28:24 -0700 (PDT) Received: from localhost.localdomain ([2001:998:22:0:60cb:8180:a416:f400]) by smtp.gmail.com with ESMTPSA id v25-20020a056512049900b004eff32d6a21sm5097416lfq.121.2023.05.04.03.28.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 May 2023 03:28:24 -0700 (PDT) From: Juha-Pekka Heikkila To: intel-gfx@lists.freedesktop.org Date: Thu, 4 May 2023 13:28:05 +0300 Message-Id: <20230504102805.18645-4-juhapekka.heikkila@gmail.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230504102805.18645-1-juhapekka.heikkila@gmail.com> References: <20230504102805.18645-1-juhapekka.heikkila@gmail.com> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH 4/4] drm/i915/mtl: Add handling for MTL ccs modifiers X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Add Tile4 ccs modifiers w/ auxbuffer handling Signed-off-by: Juha-Pekka Heikkila Reviewed-by: Mika Kahola --- drivers/gpu/drm/i915/display/intel_fb.c | 42 ++++++++++++++++++- .../drm/i915/display/skl_universal_plane.c | 22 +++++++++- 2 files changed, 61 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_fb.c b/drivers/gpu/drm/i915/display/intel_fb.c index c004f08fcfe1..f9420a68ed3c 100644 --- a/drivers/gpu/drm/i915/display/intel_fb.c +++ b/drivers/gpu/drm/i915/display/intel_fb.c @@ -157,6 +157,32 @@ struct intel_modifier_desc { static const struct intel_modifier_desc intel_modifiers[] = { { + .modifier = I915_FORMAT_MOD_4_TILED_MTL_MC_CCS, + .display_ver = { 14, 14 }, + .plane_caps = INTEL_PLANE_CAP_TILING_4 | INTEL_PLANE_CAP_CCS_MC, + + .ccs.packed_aux_planes = BIT(1), + .ccs.planar_aux_planes = BIT(2) | BIT(3), + + FORMAT_OVERRIDE(gen12_ccs_formats), + }, { + .modifier = I915_FORMAT_MOD_4_TILED_MTL_RC_CCS, + .display_ver = { 14, 14 }, + .plane_caps = INTEL_PLANE_CAP_TILING_4 | INTEL_PLANE_CAP_CCS_RC, + + .ccs.packed_aux_planes = BIT(1), + + FORMAT_OVERRIDE(gen12_ccs_formats), + }, { + .modifier = I915_FORMAT_MOD_4_TILED_MTL_RC_CCS_CC, + .display_ver = { 14, 14 }, + .plane_caps = INTEL_PLANE_CAP_TILING_4 | INTEL_PLANE_CAP_CCS_RC_CC, + + .ccs.cc_planes = BIT(2), + .ccs.packed_aux_planes = BIT(1), + + FORMAT_OVERRIDE(gen12_ccs_cc_formats), + }, { .modifier = I915_FORMAT_MOD_4_TILED_DG2_MC_CCS, .display_ver = { 13, 13 }, .plane_caps = INTEL_PLANE_CAP_TILING_4 | INTEL_PLANE_CAP_CCS_MC, @@ -370,6 +396,14 @@ static bool plane_has_modifier(struct drm_i915_private *i915, if (!plane_caps_contain_all(plane_caps, md->plane_caps)) return false; + /* + * Separate AuxCCS and Flat CCS modifiers to be run only on platforms + * where supported. + */ + if (intel_fb_is_ccs_modifier(md->modifier) && + HAS_FLAT_CCS(i915) != !md->ccs.packed_aux_planes) + return false; + return true; } @@ -489,7 +523,7 @@ static bool intel_fb_is_gen12_ccs_aux_plane(const struct drm_framebuffer *fb, in { const struct intel_modifier_desc *md = lookup_modifier(fb->modifier); - return check_modifier_display_ver_range(md, 12, 13) && + return check_modifier_display_ver_range(md, 12, 14) && ccs_aux_plane_mask(md, fb->format) & BIT(color_plane); } @@ -605,6 +639,9 @@ intel_tile_width_bytes(const struct drm_framebuffer *fb, int color_plane) if (intel_fb_is_ccs_aux_plane(fb, color_plane)) return 128; fallthrough; + case I915_FORMAT_MOD_4_TILED_MTL_RC_CCS: + case I915_FORMAT_MOD_4_TILED_MTL_RC_CCS_CC: + case I915_FORMAT_MOD_4_TILED_MTL_MC_CCS: case I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS: case I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC: case I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS: @@ -791,6 +828,9 @@ unsigned int intel_surf_alignment(const struct drm_framebuffer *fb, case I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS: case I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS: case I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC: + case I915_FORMAT_MOD_4_TILED_MTL_MC_CCS: + case I915_FORMAT_MOD_4_TILED_MTL_RC_CCS: + case I915_FORMAT_MOD_4_TILED_MTL_RC_CCS_CC: return 16 * 1024; case I915_FORMAT_MOD_Y_TILED_CCS: case I915_FORMAT_MOD_Yf_TILED_CCS: diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c b/drivers/gpu/drm/i915/display/skl_universal_plane.c index 8ea0598a5a07..f6f760e59c9e 100644 --- a/drivers/gpu/drm/i915/display/skl_universal_plane.c +++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c @@ -789,6 +789,14 @@ static u32 skl_plane_ctl_tiling(u64 fb_modifier) PLANE_CTL_CLEAR_COLOR_DISABLE; case I915_FORMAT_MOD_4_TILED_DG2_RC_CCS_CC: return PLANE_CTL_TILED_4 | PLANE_CTL_RENDER_DECOMPRESSION_ENABLE; + case I915_FORMAT_MOD_4_TILED_MTL_RC_CCS: + return PLANE_CTL_TILED_4 | + PLANE_CTL_RENDER_DECOMPRESSION_ENABLE | + PLANE_CTL_CLEAR_COLOR_DISABLE; + case I915_FORMAT_MOD_4_TILED_MTL_RC_CCS_CC: + return PLANE_CTL_TILED_4 | PLANE_CTL_RENDER_DECOMPRESSION_ENABLE; + case I915_FORMAT_MOD_4_TILED_MTL_MC_CCS: + return PLANE_CTL_TILED_4 | PLANE_CTL_MEDIA_DECOMPRESSION_ENABLE; case I915_FORMAT_MOD_Y_TILED_CCS: case I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC: return PLANE_CTL_TILED_Y | PLANE_CTL_RENDER_DECOMPRESSION_ENABLE; @@ -2160,6 +2168,11 @@ skl_plane_disable_flip_done(struct intel_plane *plane) static bool skl_plane_has_rc_ccs(struct drm_i915_private *i915, enum pipe pipe, enum plane_id plane_id) { + /* Wa_14017240301 */ + if (IS_MTL_GRAPHICS_STEP(i915, M, STEP_A0, STEP_B0) || + IS_MTL_GRAPHICS_STEP(i915, P, STEP_A0, STEP_B0)) + return false; + /* Wa_22011186057 */ if (IS_ADLP_DISPLAY_STEP(i915, STEP_A0, STEP_B0)) return false; @@ -2441,12 +2454,17 @@ skl_get_initial_plane_config(struct intel_crtc *crtc, case PLANE_CTL_TILED_Y: plane_config->tiling = I915_TILING_Y; if (val & PLANE_CTL_RENDER_DECOMPRESSION_ENABLE) - if (DISPLAY_VER(dev_priv) >= 12) + if (DISPLAY_VER(dev_priv) >= 14) + fb->modifier = I915_FORMAT_MOD_4_TILED_MTL_RC_CCS; + else if (DISPLAY_VER(dev_priv) >= 12) fb->modifier = I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS; else fb->modifier = I915_FORMAT_MOD_Y_TILED_CCS; else if (val & PLANE_CTL_MEDIA_DECOMPRESSION_ENABLE) - fb->modifier = I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS; + if (DISPLAY_VER(dev_priv) >= 14) + fb->modifier = I915_FORMAT_MOD_4_TILED_MTL_MC_CCS; + else + fb->modifier = I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS; else fb->modifier = I915_FORMAT_MOD_Y_TILED; break;