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 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 B3E34C10DC3 for ; Mon, 4 Dec 2023 20:34:37 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C783110E3E3; Mon, 4 Dec 2023 20:34:36 +0000 (UTC) Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by gabe.freedesktop.org (Postfix) with ESMTPS id 608B510E3E3; Mon, 4 Dec 2023 20:34:32 +0000 (UTC) Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by ams.source.kernel.org (Postfix) with ESMTP id E5395B81211; Mon, 4 Dec 2023 20:34:30 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8D512C433C7; Mon, 4 Dec 2023 20:34:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1701722070; bh=8SAQFhl1WNO7lMXy+iuBPzv3y+k5QbJiqIb5Kk4ciFI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HiYRLuG0XWKtDOmjvp8BMXSXHLWIy+l6cgr+tErZ6pUZ2Z/j9aiKc4CRC9hlmK4xL ruTkYS5YwDnuJzmxza9gQgUK++OBhtUayCIoLp5mjnAabNpmJXdO7tRN1W5Ct0LYC/ wH6pU/J1jLutRyZsm0X4Wh9gpEQWyhJmtfZH+mduEkLFDeSl2P83E33Io80L61T8Rm vvIof37LsWCYmquW0OF/czic/apwVdOyjR6kYiqTGUDSIMAKMxVDsp/Q9A8OxyB1G1 kYi+RLN5Gn9N7apFkbrkkSnc/2G0UlglKiusLhcW8aCiyVUjuY7bx1BP2x7yUH6xiC Nw+26H5NQs7LA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH AUTOSEL 6.6 24/32] drm/amdkfd: Use common function for IP version check Date: Mon, 4 Dec 2023 15:32:44 -0500 Message-ID: <20231204203317.2092321-24-sashal@kernel.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231204203317.2092321-1-sashal@kernel.org> References: <20231204203317.2092321-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.6.4 Content-Transfer-Encoding: 8bit X-BeenThere: amd-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sasha Levin , Mukul Joshi , Felix.Kuehling@amd.com, Xinhui.Pan@amd.com, Harish Kasiviswanathan , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, daniel@ffwll.ch, Alex Deucher , airlied@gmail.com, christian.koenig@amd.com Errors-To: amd-gfx-bounces@lists.freedesktop.org Sender: "amd-gfx" From: Mukul Joshi [ Upstream commit 2f86bf79b63dbe6963ebc647b77a5f576a906b40 ] KFD_GC_VERSION was recently updated to use a new function for IP version checks. As a result, use KFD_GC_VERSION as the common function for all IP version checks in KFD. Signed-off-by: Mukul Joshi Reviewed-by: Harish Kasiviswanathan Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h index fa24e1852493d..df7a5cdb8693f 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h +++ b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h @@ -1128,7 +1128,7 @@ static inline struct kfd_node *kfd_node_by_irq_ids(struct amdgpu_device *adev, struct kfd_dev *dev = adev->kfd.dev; uint32_t i; - if (adev->ip_versions[GC_HWIP][0] != IP_VERSION(9, 4, 3)) + if (KFD_GC_VERSION(dev) != IP_VERSION(9, 4, 3)) return dev->nodes[0]; for (i = 0; i < dev->num_nodes; i++) -- 2.42.0 From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C99BA35F04 for ; Mon, 4 Dec 2023 20:34:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="HiYRLuG0" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8D512C433C7; Mon, 4 Dec 2023 20:34:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1701722070; bh=8SAQFhl1WNO7lMXy+iuBPzv3y+k5QbJiqIb5Kk4ciFI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HiYRLuG0XWKtDOmjvp8BMXSXHLWIy+l6cgr+tErZ6pUZ2Z/j9aiKc4CRC9hlmK4xL ruTkYS5YwDnuJzmxza9gQgUK++OBhtUayCIoLp5mjnAabNpmJXdO7tRN1W5Ct0LYC/ wH6pU/J1jLutRyZsm0X4Wh9gpEQWyhJmtfZH+mduEkLFDeSl2P83E33Io80L61T8Rm vvIof37LsWCYmquW0OF/czic/apwVdOyjR6kYiqTGUDSIMAKMxVDsp/Q9A8OxyB1G1 kYi+RLN5Gn9N7apFkbrkkSnc/2G0UlglKiusLhcW8aCiyVUjuY7bx1BP2x7yUH6xiC Nw+26H5NQs7LA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Mukul Joshi , Harish Kasiviswanathan , Alex Deucher , Sasha Levin , Felix.Kuehling@amd.com, christian.koenig@amd.com, Xinhui.Pan@amd.com, airlied@gmail.com, daniel@ffwll.ch, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 6.6 24/32] drm/amdkfd: Use common function for IP version check Date: Mon, 4 Dec 2023 15:32:44 -0500 Message-ID: <20231204203317.2092321-24-sashal@kernel.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231204203317.2092321-1-sashal@kernel.org> References: <20231204203317.2092321-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.6.4 Content-Transfer-Encoding: 8bit From: Mukul Joshi [ Upstream commit 2f86bf79b63dbe6963ebc647b77a5f576a906b40 ] KFD_GC_VERSION was recently updated to use a new function for IP version checks. As a result, use KFD_GC_VERSION as the common function for all IP version checks in KFD. Signed-off-by: Mukul Joshi Reviewed-by: Harish Kasiviswanathan Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h index fa24e1852493d..df7a5cdb8693f 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h +++ b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h @@ -1128,7 +1128,7 @@ static inline struct kfd_node *kfd_node_by_irq_ids(struct amdgpu_device *adev, struct kfd_dev *dev = adev->kfd.dev; uint32_t i; - if (adev->ip_versions[GC_HWIP][0] != IP_VERSION(9, 4, 3)) + if (KFD_GC_VERSION(dev) != IP_VERSION(9, 4, 3)) return dev->nodes[0]; for (i = 0; i < dev->num_nodes; i++) -- 2.42.0 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 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 E5401C10DC1 for ; Mon, 4 Dec 2023 20:34:38 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3DDF310E3E7; Mon, 4 Dec 2023 20:34:37 +0000 (UTC) Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by gabe.freedesktop.org (Postfix) with ESMTPS id 608B510E3E3; Mon, 4 Dec 2023 20:34:32 +0000 (UTC) Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by ams.source.kernel.org (Postfix) with ESMTP id E5395B81211; Mon, 4 Dec 2023 20:34:30 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8D512C433C7; Mon, 4 Dec 2023 20:34:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1701722070; bh=8SAQFhl1WNO7lMXy+iuBPzv3y+k5QbJiqIb5Kk4ciFI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HiYRLuG0XWKtDOmjvp8BMXSXHLWIy+l6cgr+tErZ6pUZ2Z/j9aiKc4CRC9hlmK4xL ruTkYS5YwDnuJzmxza9gQgUK++OBhtUayCIoLp5mjnAabNpmJXdO7tRN1W5Ct0LYC/ wH6pU/J1jLutRyZsm0X4Wh9gpEQWyhJmtfZH+mduEkLFDeSl2P83E33Io80L61T8Rm vvIof37LsWCYmquW0OF/czic/apwVdOyjR6kYiqTGUDSIMAKMxVDsp/Q9A8OxyB1G1 kYi+RLN5Gn9N7apFkbrkkSnc/2G0UlglKiusLhcW8aCiyVUjuY7bx1BP2x7yUH6xiC Nw+26H5NQs7LA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH AUTOSEL 6.6 24/32] drm/amdkfd: Use common function for IP version check Date: Mon, 4 Dec 2023 15:32:44 -0500 Message-ID: <20231204203317.2092321-24-sashal@kernel.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231204203317.2092321-1-sashal@kernel.org> References: <20231204203317.2092321-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.6.4 Content-Transfer-Encoding: 8bit X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sasha Levin , Mukul Joshi , Felix.Kuehling@amd.com, Xinhui.Pan@amd.com, Harish Kasiviswanathan , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Alex Deucher , christian.koenig@amd.com Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Mukul Joshi [ Upstream commit 2f86bf79b63dbe6963ebc647b77a5f576a906b40 ] KFD_GC_VERSION was recently updated to use a new function for IP version checks. As a result, use KFD_GC_VERSION as the common function for all IP version checks in KFD. Signed-off-by: Mukul Joshi Reviewed-by: Harish Kasiviswanathan Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h index fa24e1852493d..df7a5cdb8693f 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h +++ b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h @@ -1128,7 +1128,7 @@ static inline struct kfd_node *kfd_node_by_irq_ids(struct amdgpu_device *adev, struct kfd_dev *dev = adev->kfd.dev; uint32_t i; - if (adev->ip_versions[GC_HWIP][0] != IP_VERSION(9, 4, 3)) + if (KFD_GC_VERSION(dev) != IP_VERSION(9, 4, 3)) return dev->nodes[0]; for (i = 0; i < dev->num_nodes; i++) -- 2.42.0