From mboxrd@z Thu Jan 1 00:00:00 1970 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B21B1C54E94 for ; Sun, 22 Jan 2023 15:27:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231452AbjAVP1Y (ORCPT ); Sun, 22 Jan 2023 10:27:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55400 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231448AbjAVP1Y (ORCPT ); Sun, 22 Jan 2023 10:27:24 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5C16B23100 for ; Sun, 22 Jan 2023 07:27:23 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 1483FB80B20 for ; Sun, 22 Jan 2023 15:27:22 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 63B50C433EF; Sun, 22 Jan 2023 15:27:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1674401240; bh=bQnoNS0XjH1O/2AQytDihP+jVtkDXpNk+sC5q6JxebY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cJX8/McQuhHJr8WizZge13UM0py0DcMxJ/6xXrJN8greT53prH6nWJvNUf56FRcsA 7HXKPJ8rgv+nMfKO+uiQSeVyX2/rPolvZmtgfQjgGuV2XpVkNx1ryFD7mlcbyRfGHL lBny5fsGvwluXDxCaaTVAHmr/W2B5xV7naOPiC84= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Lang Yu , Aaron Liu , Yifan Zhang , Alex Deucher Subject: [PATCH 6.1 135/193] drm/amdgpu: allow multipipe policy on ASICs with one MEC Date: Sun, 22 Jan 2023 16:04:24 +0100 Message-Id: <20230122150252.519689870@linuxfoundation.org> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230122150246.321043584@linuxfoundation.org> References: <20230122150246.321043584@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Lang Yu commit dc88063b87775971be564d79dc1b05f7b8b5c135 upstream. Always enable multipipe policy on ASICs with GC VERSION > 9.0.0 instead of MEC number > 1. This will allow multipipe policy on ASICs with one MEC, e.g., gfx11 APUs. Signed-off-by: Lang Yu Reviewed-by: Aaron Liu Reviewed-by: Yifan Zhang Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org # 6.1.x Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 3 +++ 1 file changed, 3 insertions(+) --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c @@ -156,6 +156,9 @@ static bool amdgpu_gfx_is_compute_multip return amdgpu_compute_multipipe == 1; } + if (adev->ip_versions[GC_HWIP][0] > IP_VERSION(9, 0, 0)) + return true; + /* FIXME: spreading the queues across pipes causes perf regressions * on POLARIS11 compute workloads */ if (adev->asic_type == CHIP_POLARIS11)