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 BC5471A3689; Wed, 5 Jun 2024 12:03:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717589033; cv=none; b=kG+JZOZspg+z+JP7wx0c98n333eAPjWcvUh3ym7pI/mw9oEaMLuGy+ECnKYhapMZYKz/4AklkNhKKksRiEBjLVAk0szbNHSMafRSwgkWwRHdVlqPiGBJiX+hLr1y+GJA2ys+aX6hBMyqVX+I1Lm4w6jPAmQAvWVUsJOr6Et/FwU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717589033; c=relaxed/simple; bh=huM3Hia/E8C/3CGVJFNUtJsHYsCR6y3z74t2rsw1sPI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eiG8Sa0u0WZvinlR0Gxmlu0Dd/60fdLgzmcCRqt8I8zQp8ADo9XzgejANMBcPeUSFc9acsdktNBsoAvllT5kCFaN4UQX4CV7q71TBbLu59l4kHqyyQ8RvoenCe+SG+AShAElKbX5Lk6m8WPvmmT88gIL/N39zfz1IJjX3pX2EqE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=bxSef32A; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="bxSef32A" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 11A77C32781; Wed, 5 Jun 2024 12:03:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1717589033; bh=huM3Hia/E8C/3CGVJFNUtJsHYsCR6y3z74t2rsw1sPI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bxSef32AZ8FligZkolP9iURMo5sTk4PMJaN4QHVQUMwKp1yaT0aoGApIuyzDT0/5N eLgXV//WzlKnY9orInUmPd5xAt3h6mvQkSu2XAHHKS5Pj+J968u6+o9Fl6k6r7J/XF 6Tpxjj4bhq8Ezha3gs55OyqG9vMuWZaPrkTBKxhLsBDH7l9KgBUOKJ9G4lWfWKlacs 8ig/78ocJmsj3oegqOACr7Z9mqejLFPFjyAaJj9iAQSW6YsdIrCQgJZBuADGYjtT6l 41mBBAUZwDwcCNygK92LotA314NDuDRR4Dkwuax1WSMsNJRg+wqgiPdfOnluyQ6FfI lSrpwp+zRepYA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Alex Deucher , Feifei Xu , Feifei Xu , Sasha Levin , Felix.Kuehling@amd.com, christian.koenig@amd.com, Xinhui.Pan@amd.com, airlied@gmail.com, daniel@ffwll.ch, nathan@kernel.org, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, llvm@lists.linux.dev Subject: [PATCH AUTOSEL 6.8 17/18] Revert "drm/amdkfd: fix gfx_target_version for certain 11.0.3 devices" Date: Wed, 5 Jun 2024 08:03:07 -0400 Message-ID: <20240605120319.2966627-17-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240605120319.2966627-1-sashal@kernel.org> References: <20240605120319.2966627-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.8.12 Content-Transfer-Encoding: 8bit From: Alex Deucher [ Upstream commit dd2b75fd9a79bf418e088656822af06fc253dbe3 ] This reverts commit 28ebbb4981cb1fad12e0b1227dbecc88810b1ee8. Revert this commit as apparently the LLVM code to take advantage of this never landed. Reviewed-by: Feifei Xu Signed-off-by: Alex Deucher Cc: Feifei Xu Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdkfd/kfd_device.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device.c b/drivers/gpu/drm/amd/amdkfd/kfd_device.c index fcf6558d019e5..7d39982bf74e2 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_device.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_device.c @@ -405,15 +405,8 @@ struct kfd_dev *kgd2kfd_probe(struct amdgpu_device *adev, bool vf) f2g = &gfx_v11_kfd2kgd; break; case IP_VERSION(11, 0, 3): - if ((adev->pdev->device == 0x7460 && - adev->pdev->revision == 0x00) || - (adev->pdev->device == 0x7461 && - adev->pdev->revision == 0x00)) - /* Note: Compiler version is 11.0.5 while HW version is 11.0.3 */ - gfx_target_version = 110005; - else - /* Note: Compiler version is 11.0.1 while HW version is 11.0.3 */ - gfx_target_version = 110001; + /* Note: Compiler version is 11.0.1 while HW version is 11.0.3 */ + gfx_target_version = 110001; f2g = &gfx_v11_kfd2kgd; break; case IP_VERSION(11, 5, 0): -- 2.43.0