Received: by 2002:a05:6358:4e97:b0:b3:742d:4702 with SMTP id ce23csp3039827rwb; Mon, 15 Aug 2022 16:41:28 -0700 (PDT) X-Google-Smtp-Source: AA6agR4P4YocBhXzWvMQinhW8hK8lnwlRhcxDlRW1BIMrOgmCpHvQIBKzbOcWZvidssNLED7go9N X-Received: by 2002:a17:907:20d1:b0:731:5169:106b with SMTP id qq17-20020a17090720d100b007315169106bmr11964021ejb.667.1660606888442; Mon, 15 Aug 2022 16:41:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1660606888; cv=none; d=google.com; s=arc-20160816; b=vKiQERv/g8Ju6xq1+yWNLx7Xp9D7eesPp0a2qfmSIBcQHi+W5q3myjY62HE2bY+G8U hGMu6+xqWNvbj/A5C6gYzI2C4oxvTaHDVJj0sJZ0F/gpYbBVV2Bx+S+McSgEjeW0idJ/ /Omr9dEWFv6Br4d8V8QcOi2fU9AN497zCUmco5w/XzJeK5G7zStmEdHUH0GT1x+HdLOZ cw9gyTFOAIr4LmgAkAkDRjoyqPL7A7lcc06KDRjbIx/2PSs19s1n3XNK1KsK1bFwfvq2 F539AaIAHu2TBlKGluCp+w/S7FV79Exg4nm8CVrignrQrV/STksUqn8i8fsf6ZTJJSc8 3/cQ== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=WyG5rLTZdeSiDl+Ndvi9gVsNH8OD4T//gthHgG0T6nc=; b=vFMopBA6gy8Xg3TYhn+jYGZ/ufPvrf5g0bpVa4PMqT0drJDa6oez6uK52QRy0i1Ygm mWmnkVkE9nD2eQQtuMPxTifBnf9MLrP8DUpYH8LCdKJVz62xUBm4c+OABfpvQD3bg93Y vEiVSs4icv855efc8hrdZOHt6OH5eRhmHYZIxEZPYtQnS5yQTuvfuZX7w1lU/xLg5hho C+m0c7q8indL/7vc7bh9ZaSWxt3qmd15GDwyVuCXagmoKd4m++YQf1aUdopIig//cJbG U5TckX/pChTIMZgZ4hpj2EQvSDpGQvpMPeHVj0f68N1FclKj2CSSnYVL6yG5vH6wlmMB 6gog== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=lnkf8D2s; 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=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id eb5-20020a0564020d0500b0043d476f96c1si10278542edb.86.2022.08.15.16.40.54; Mon, 15 Aug 2022 16:41:28 -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=@linuxfoundation.org header.s=korg header.b=lnkf8D2s; 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=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1353881AbiHOXjO (ORCPT + 99 others); Mon, 15 Aug 2022 19:39:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50828 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1353726AbiHOXgF (ORCPT ); Mon, 15 Aug 2022 19:36:05 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E9315BCCC0; Mon, 15 Aug 2022 13:09:17 -0700 (PDT) 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 1D565B80EA8; Mon, 15 Aug 2022 20:09:16 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 64750C433C1; Mon, 15 Aug 2022 20:09:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1660594154; bh=PG3q0yIr5lZ0sHZ80edAXdyGyli4uMYJ5uN85gDj5iU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lnkf8D2sdCz6j3t651dQsqY+v4omFamZ07Iswy1T6CZxjirJrdo8tvPzhbbzLlHji tvxlQDQVfghvfGYY+Ojq7eRJyb9SBcZT4q3XBC6D7RqXGRXDaC7uoNqVTM89STtYcE QszDS07zEfiuXSRodWnZCZmO3JsN5F6O+tA8Gj0k= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Yifan Zhang , Alex Deucher , Tim Huang , Sasha Levin Subject: [PATCH 5.19 0387/1157] drm/amdkfd: correct sdma queue number of sdma 6.0.1 Date: Mon, 15 Aug 2022 19:55:43 +0200 Message-Id: <20220815180455.178511421@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220815180439.416659447@linuxfoundation.org> References: <20220815180439.416659447@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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 From: Yifan Zhang [ Upstream commit efb4fd107cfd9748f777a4e9015d803d3c9db68b ] sdma 6.0.1 has 8 queues instead of 2. Fixes: 26776a7031c423 ("drm/amdkfd: add GC 11.0.1 KFD support") Signed-off-by: Yifan Zhang Acked-by: Alex Deucher Reviewed-by: Tim Huang Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdkfd/kfd_device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c b/drivers/gpu/drm/amd/amdkfd/kfd_device.c index a08769c5e94b..d9f57a20a8bc 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c @@ -75,7 +75,6 @@ static void kfd_device_info_set_sdma_info(struct kfd_dev *kfd) case IP_VERSION(5, 2, 3):/* YELLOW_CARP */ case IP_VERSION(5, 2, 6):/* GC 10.3.6 */ case IP_VERSION(5, 2, 7):/* GC 10.3.7 */ - case IP_VERSION(6, 0, 1): kfd->device_info.num_sdma_queues_per_engine = 2; break; case IP_VERSION(4, 2, 0):/* VEGA20 */ @@ -90,6 +89,7 @@ static void kfd_device_info_set_sdma_info(struct kfd_dev *kfd) case IP_VERSION(5, 2, 4):/* DIMGREY_CAVEFISH */ case IP_VERSION(5, 2, 5):/* BEIGE_GOBY */ case IP_VERSION(6, 0, 0): + case IP_VERSION(6, 0, 1): case IP_VERSION(6, 0, 2): kfd->device_info.num_sdma_queues_per_engine = 8; break; -- 2.35.1