From patchwork Thu Oct 20 20:53:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Joaqu=C3=ADn_Ignacio_Aramend=C3=ADa?= X-Patchwork-Id: 6399 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4242:0:0:0:0:0 with SMTP id s2csp322084wrr; Thu, 20 Oct 2022 14:04:17 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4xaHZpHwQImZ5OG0aOLs1/o64OgRblf1H+Qd4u/7quPdPDW4BbcpiNbYc1w4ueNNVG/Mm8 X-Received: by 2002:a17:906:ee81:b0:77e:829a:76e9 with SMTP id wt1-20020a170906ee8100b0077e829a76e9mr13267941ejb.207.1666299856802; Thu, 20 Oct 2022 14:04:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666299856; cv=none; d=google.com; s=arc-20160816; b=HiCwAmhSYUWWchT4fL1DEM76VZA+Dat+HKnCEXyWlnM+zMTp9CcnGh2wyNDMpyua3P 7gtTVGaQkca08Nn/gNJB2iwVCyBIpdo0lTttz1DKCaG0Rtli/9dGmm44UCXgsiwv35Fz xgOFICE19Xlo7AYHl/f8k3S7Km3kdSHfspqauavKL2is8e2h2uOgCpKV1fDTxoMPRDkA GK6uuzSFIW6f0LZVs/A8Hbsdd49rDfDJHeHULtWvXMdAmMeeWlRm9Zi1TbjwnzVQjBJn fKGlDTyI1sFZCWJwYLodJX0SxGPlurtqFr8WCnPZ9wmcnPsYVm0mcAn+bKcKQcVw7RJX MTOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=udeMwJR6RHU8GcCEPzr8LmpawXN04cnbwas6lSAlJBo=; b=yeF49UV+MTJzDWDDooGLH5pIeYNZytmhEDWCqSRfJgqsPsPfyvhnd+fW+RlXUEJPQl 5Yj2a9HeoLL2IM5A9OiSwpBlFmMm5F29B2bTtUi4P1OLErw8xQ6R0vZoZirJ9h6SpEtR XN5H5LM+Ue0JdSW+v8EKKSDfZB/wImYEPYJe4qEU5eiF/1kXV7ip/lwDO+MkYsEjKI3j 7+HyJk+K49LEMG1fmgJfLO4B9ygFRkxMHpfZeYmlHu+RvqxMBv6HKuQlP8E1rx3rxLNM cPqYiS80kGSxUO63QKk7124yKtCTPcjkqBCBjMvnpA3rtJb/8mmUGMrUz5PJ1205PZXq Tr4Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=KVeaHUE9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id mp31-20020a1709071b1f00b0073d9ea386d4si16170439ejc.983.2022.10.20.14.03.52; Thu, 20 Oct 2022 14:04:16 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=KVeaHUE9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229832AbiJTUzo (ORCPT + 99 others); Thu, 20 Oct 2022 16:55:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37050 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229853AbiJTUzk (ORCPT ); Thu, 20 Oct 2022 16:55:40 -0400 Received: from mail-oi1-x231.google.com (mail-oi1-x231.google.com [IPv6:2607:f8b0:4864:20::231]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C2C03100BE6 for ; Thu, 20 Oct 2022 13:55:33 -0700 (PDT) Received: by mail-oi1-x231.google.com with SMTP id g10so991196oif.10 for ; Thu, 20 Oct 2022 13:55:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=udeMwJR6RHU8GcCEPzr8LmpawXN04cnbwas6lSAlJBo=; b=KVeaHUE9jUea0XpTgtJ1rn6HLB6rg4ZxwSNVxLOW+RekAIAIa0w7ibtTvmZ1Dc/w8v EBjJJ6oUkVCbEoDvth0/lNO0SegakBo+Ra8ipV2bzD/4NFlGJwWkgM85g1L8XucV/qlP R8Oj9MEqLhM0BNB8rJOlAi5MGlV2hG5XomR3q0JI6rSaY7WYCJwm1WW61FxYaC9JsaXh PSKCR7cpBAdGnzxO2Rrdb7nM1ta0NDWjow6e9zF94ykwi/J5zin7vJE3qTm0wymkp1V5 mub4o3P52y2p3URtUU/Mj/3VB3vIrQRRTfSTndMGA9SoSdq9w3P51Fa9jY5QH5PA4BoE c7yA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=udeMwJR6RHU8GcCEPzr8LmpawXN04cnbwas6lSAlJBo=; b=vy2Un9A3ywOb5kVWFTn5YAvoJ4iqZLdNuQXFpNPldAmTm/7xYVfbLFI93mwfHu5b38 8ATfc7hbWg8vz5IXioXyiphfchtTfj+q3ycgv0aYd+BK85jiTx5Gve7k8Nz6mOC5kM0Y esPqWRyqkCyXYjkfyGXrA5eBiISr3cO1zrV1PeHYGlpUcLS8MW4z8mLOXetQqTnP5XZm 8rIXLiBz84xIrjL20U1DdFr5GIVrWOSVE/Ylolwgzr2FzoB/8CrCfE1s0f2fJDRonQcI a3WHD0ega2F5Bbp8dhmS+qxVcla4oLDqHm/mQkKogphhAylWKXhSxGKdsxii91h65hn8 viDw== X-Gm-Message-State: ACrzQf10BKvX+dplWN6ns5FRyD9xNvF9VSsPUk/tqu5P4dTU1Vebu+5I 1/aZb58Z3DXqW+30J+mUH8M= X-Received: by 2002:a05:6808:1998:b0:355:3480:51b9 with SMTP id bj24-20020a056808199800b00355348051b9mr7658382oib.195.1666299331988; Thu, 20 Oct 2022 13:55:31 -0700 (PDT) Received: from smeagol.fibertel.com.ar ([201.235.4.68]) by smtp.gmail.com with ESMTPSA id h5-20020a4aa9c5000000b00480e77f90f9sm2129998oon.41.2022.10.20.13.55.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Oct 2022 13:55:31 -0700 (PDT) From: =?utf-8?q?Joaqu=C3=ADn_Ignacio_Aramend=C3=ADa?= To: rodrigo.siqueira@amd.com Cc: Xinhui.Pan@amd.com, airlied@gmail.com, alexander.deucher@amd.com, amd-gfx@lists.freedesktop.org, christian.koenig@amd.com, daniel@ffwll.ch, dri-devel@lists.freedesktop.org, harry.wentland@amd.com, linux-kernel@vger.kernel.org, samsagax@gmail.com, sunpeng.li@amd.com Subject: [PATCH] drm/amd/display: Revert logic for plane modifiers Date: Thu, 20 Oct 2022 17:53:18 -0300 Message-Id: <20221020205317.96136-1-samsagax@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747130811824910386?= X-GMAIL-MSGID: =?utf-8?q?1747242038660602471?= This file was split in commit 5d945cbcd4b16a29d6470a80dfb19738f9a4319f ("drm/amd/display: Create a file dedicated to planes") and the logic in dm_plane_format_mod_supported() function got changed by a switch logic. That change broke drm_plane modifiers setting on series 5000 APUs (tested on OXP mini AMD 5800U and HP Dev One 5850U PRO) leading to Gamescope not working as reported on GitHub[1] To reproduce the issue, enter a TTY and run: $ gamescope -- vkcube With said commit applied it will abort. This one restores the old logic, fixing the issue that affects Gamescope. [1](https://github.com/Plagman/gamescope/issues/624) Signed-off-by: Joaquín Ignacio Aramendía Reviewed-by: Bas Nieuwenhuizen --- .../amd/display/amdgpu_dm/amdgpu_dm_plane.c | 51 +++---------------- 1 file changed, 8 insertions(+), 43 deletions(-) -- 2.38.1 diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c index dfd3be49eac8..1d47d2d69781 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c @@ -1369,7 +1369,8 @@ static bool dm_plane_format_mod_supported(struct drm_plane *plane, { struct amdgpu_device *adev = drm_to_adev(plane->dev); const struct drm_format_info *info = drm_format_info(format); - struct hw_asic_id asic_id = adev->dm.dc->ctx->asic_id; + + int i; enum dm_micro_swizzle microtile = modifier_gfx9_swizzle_mode(modifier) & 3; @@ -1386,49 +1387,13 @@ static bool dm_plane_format_mod_supported(struct drm_plane *plane, return true; } - /* check if swizzle mode is supported by this version of DCN */ - switch (asic_id.chip_family) { - case FAMILY_SI: - case FAMILY_CI: - case FAMILY_KV: - case FAMILY_CZ: - case FAMILY_VI: - /* asics before AI does not have modifier support */ - return false; - case FAMILY_AI: - case FAMILY_RV: - case FAMILY_NV: - case FAMILY_VGH: - case FAMILY_YELLOW_CARP: - case AMDGPU_FAMILY_GC_10_3_6: - case AMDGPU_FAMILY_GC_10_3_7: - switch (AMD_FMT_MOD_GET(TILE, modifier)) { - case AMD_FMT_MOD_TILE_GFX9_64K_R_X: - case AMD_FMT_MOD_TILE_GFX9_64K_D_X: - case AMD_FMT_MOD_TILE_GFX9_64K_S_X: - case AMD_FMT_MOD_TILE_GFX9_64K_D: - return true; - default: - return false; - } - break; - case AMDGPU_FAMILY_GC_11_0_0: - case AMDGPU_FAMILY_GC_11_0_1: - switch (AMD_FMT_MOD_GET(TILE, modifier)) { - case AMD_FMT_MOD_TILE_GFX11_256K_R_X: - case AMD_FMT_MOD_TILE_GFX9_64K_R_X: - case AMD_FMT_MOD_TILE_GFX9_64K_D_X: - case AMD_FMT_MOD_TILE_GFX9_64K_S_X: - case AMD_FMT_MOD_TILE_GFX9_64K_D: - return true; - default: - return false; - } - break; - default: - ASSERT(0); /* Unknown asic */ - break; + /* Check that the modifier is on the list of the plane's supported modifiers. */ + for (i = 0; i < plane->modifier_count; i++) { + if (modifier == plane->modifiers[i]) + break; } + if (i == plane->modifier_count) + return false; /* * For D swizzle the canonical modifier depends on the bpp, so check