From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin via amd-gfx Subject: [PATCH AUTOSEL 4.20 068/105] drm/amdkfd: Don't assign dGPUs to APU topology devices Date: Tue, 12 Feb 2019 21:32:59 -0500 Message-ID: <20190213023336.19019-68-sashal@kernel.org> References: <20190213023336.19019-1-sashal@kernel.org> Reply-To: Sasha Levin Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20190213023336.19019-1-sashal-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> List-Id: Discussion list for AMD gfx List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "amd-gfx" To: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: Alex Deucher , Sasha Levin , Felix Kuehling , amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org, dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org RnJvbTogRmVsaXggS3VlaGxpbmcgPEZlbGl4Lkt1ZWhsaW5nQGFtZC5jb20+CgpbIFVwc3RyZWFt IGNvbW1pdCBiYmRmNTE0ZmU1NjQ4NTY2YjA3NTQ0NzZjYmNiOTJhYzM0MjJkZGUyIF0KCmRHUFVz IG5lZWQgdGhlaXIgb3duIHRvcG9sb2d5IGRldmljZXMuIERvbid0IGFzc2lnbiB0aGVtIHRvIEFQ VSB0b3BvbG9neQpkZXZpY2VzIHdpdGggQ1BVIGNvcmVzLgoKQnVnOiBodHRwczovL2dpdGh1Yi5j b20vUmFkZW9uT3BlbkNvbXB1dGUvUk9DSy1LZXJuZWwtRHJpdmVyL2lzc3Vlcy82NgpTaWduZWQt b2ZmLWJ5OiBGZWxpeCBLdWVobGluZyA8RmVsaXguS3VlaGxpbmdAYW1kLmNvbT4KVGVzdGVkLWJ5 OiBFbGlhcyBLb25zdGFudGluaWRpcyA8ZWtvbmRpc0BnbWFpbC5jb20+CkFja2VkLWJ5OiBBbGV4 IERldWNoZXIgPGFsZXhhbmRlci5kZXVjaGVyQGFtZC5jb20+ClNpZ25lZC1vZmYtYnk6IEFsZXgg RGV1Y2hlciA8YWxleGFuZGVyLmRldWNoZXJAYW1kLmNvbT4KU2lnbmVkLW9mZi1ieTogU2FzaGEg TGV2aW4gPHNhc2hhbEBrZXJuZWwub3JnPgotLS0KIGRyaXZlcnMvZ3B1L2RybS9hbWQvYW1ka2Zk L2tmZF90b3BvbG9neS5jIHwgMTIgKysrKysrKysrLS0tCiAxIGZpbGUgY2hhbmdlZCwgOSBpbnNl cnRpb25zKCspLCAzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9h bWQvYW1ka2ZkL2tmZF90b3BvbG9neS5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9hbWRrZmQva2Zk X3RvcG9sb2d5LmMKaW5kZXggZTM4NDNjNTkyOWVkLi5mZmZlY2U1ZTQyYzUgMTAwNjQ0Ci0tLSBh L2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1ka2ZkL2tmZF90b3BvbG9neS5jCisrKyBiL2RyaXZlcnMv Z3B1L2RybS9hbWQvYW1ka2ZkL2tmZF90b3BvbG9neS5jCkBAIC0xMDc0LDggKzEwNzQsNiBAQCBz dGF0aWMgdWludDMyX3Qga2ZkX2dlbmVyYXRlX2dwdV9pZChzdHJ1Y3Qga2ZkX2RldiAqZ3B1KQog ICoJCXRoZSBHUFUgZGV2aWNlIGlzIG5vdCBhbHJlYWR5IHByZXNlbnQgaW4gdGhlIHRvcG9sb2d5 IGRldmljZQogICoJCWxpc3QgdGhlbiByZXR1cm4gTlVMTC4gVGhpcyBtZWFucyBhIG5ldyB0b3Bv bG9neSBkZXZpY2UgaGFzIHRvCiAgKgkJYmUgY3JlYXRlZCBmb3IgdGhpcyBHUFUuCi0gKiBUT0RP OiBSYXRoZXIgdGhhbiBhc3NpZ2luZyBAZ3B1IHRvIGZpcnN0IHRvcG9sb2d5IGRldmljZSB3aXRo dG91dAotICoJCWdwdSBhdHRhY2hlZCwgaXQgd2lsbCBiZXR0ZXIgdG8gaGF2ZSBtb3JlIHN0cmlu Z2VudCBjaGVjay4KICAqLwogc3RhdGljIHN0cnVjdCBrZmRfdG9wb2xvZ3lfZGV2aWNlICprZmRf YXNzaWduX2dwdShzdHJ1Y3Qga2ZkX2RldiAqZ3B1KQogewpAQCAtMTA4MywxMiArMTA4MSwyMCBA QCBzdGF0aWMgc3RydWN0IGtmZF90b3BvbG9neV9kZXZpY2UgKmtmZF9hc3NpZ25fZ3B1KHN0cnVj dCBrZmRfZGV2ICpncHUpCiAJc3RydWN0IGtmZF90b3BvbG9neV9kZXZpY2UgKm91dF9kZXYgPSBO VUxMOwogCiAJZG93bl93cml0ZSgmdG9wb2xvZ3lfbG9jayk7Ci0JbGlzdF9mb3JfZWFjaF9lbnRy eShkZXYsICZ0b3BvbG9neV9kZXZpY2VfbGlzdCwgbGlzdCkKKwlsaXN0X2Zvcl9lYWNoX2VudHJ5 KGRldiwgJnRvcG9sb2d5X2RldmljZV9saXN0LCBsaXN0KSB7CisJCS8qIERpc2NyZXRlIEdQVXMg bmVlZCB0aGVpciBvd24gdG9wb2xvZ3kgZGV2aWNlIGxpc3QKKwkJICogZW50cmllcy4gRG9uJ3Qg YXNzaWduIHRoZW0gdG8gQ1BVL0FQVSBub2Rlcy4KKwkJICovCisJCWlmICghZ3B1LT5kZXZpY2Vf aW5mby0+bmVlZHNfaW9tbXVfZGV2aWNlICYmCisJCSAgICBkZXYtPm5vZGVfcHJvcHMuY3B1X2Nv cmVzX2NvdW50KQorCQkJY29udGludWU7CisKIAkJaWYgKCFkZXYtPmdwdSAmJiAoZGV2LT5ub2Rl X3Byb3BzLnNpbWRfY291bnQgPiAwKSkgewogCQkJZGV2LT5ncHUgPSBncHU7CiAJCQlvdXRfZGV2 ID0gZGV2OwogCQkJYnJlYWs7CiAJCX0KKwl9CiAJdXBfd3JpdGUoJnRvcG9sb2d5X2xvY2spOwog CXJldHVybiBvdXRfZGV2OwogfQotLSAKMi4xOS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwphbWQtZ2Z4IG1haWxpbmcgbGlzdAphbWQtZ2Z4QGxpc3Rz LmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xp c3RpbmZvL2FtZC1nZng= 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 X-Spam-Level: X-Spam-Status: No, score=-14.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 847D2C282CA for ; Wed, 13 Feb 2019 02:35:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5191D222CA for ; Wed, 13 Feb 2019 02:35:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550025330; bh=OrKTZTXmGNedz9RGTvaG6XUg8U4uUvIyYgneOlrKGXo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=rV85qiNTgkH8RbhD786Op929djAPuodPtPwZi4Rv6eI0UUJEzkMuLtuYkvYanJIch RyxrTTsu+GzJr/53zNNvdfiV8iFbw51ftknj1JOcbyER0mHqwsQDsuoNj8VMWl/DdH xofwOWrlobaKj+R8zuMpxmMcS/F33iKv6ofKAZBs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388006AbfBMCfZ (ORCPT ); Tue, 12 Feb 2019 21:35:25 -0500 Received: from mail.kernel.org ([198.145.29.99]:39028 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387983AbfBMCfW (ORCPT ); Tue, 12 Feb 2019 21:35:22 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 31ACE222CA; Wed, 13 Feb 2019 02:35:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550025322; bh=OrKTZTXmGNedz9RGTvaG6XUg8U4uUvIyYgneOlrKGXo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UJA7/noDcQmgyd3e1hLHAzsVo+DzczK2tpAJgytaGkkmXmZkJn6nfeDKWJ67/dl0B lKLd8jcTdO4uJNiqCTVjkA2YMsm9acHkuQzp31KxoEgNI3b/IcxKbyHxJivd4YmgvN XRRuOdYRktHKdpo6hLWWtMC2urCnO6JqywZSQV6I= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Felix Kuehling , Alex Deucher , Sasha Levin , dri-devel@lists.freedesktop.org, amd-gfx@lists.freedesktop.org Subject: [PATCH AUTOSEL 4.20 068/105] drm/amdkfd: Don't assign dGPUs to APU topology devices Date: Tue, 12 Feb 2019 21:32:59 -0500 Message-Id: <20190213023336.19019-68-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190213023336.19019-1-sashal@kernel.org> References: <20190213023336.19019-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Felix Kuehling [ Upstream commit bbdf514fe5648566b0754476cbcb92ac3422dde2 ] dGPUs need their own topology devices. Don't assign them to APU topology devices with CPU cores. Bug: https://github.com/RadeonOpenCompute/ROCK-Kernel-Driver/issues/66 Signed-off-by: Felix Kuehling Tested-by: Elias Konstantinidis Acked-by: Alex Deucher Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c index e3843c5929ed..fffece5e42c5 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c @@ -1074,8 +1074,6 @@ static uint32_t kfd_generate_gpu_id(struct kfd_dev *gpu) * the GPU device is not already present in the topology device * list then return NULL. This means a new topology device has to * be created for this GPU. - * TODO: Rather than assiging @gpu to first topology device withtout - * gpu attached, it will better to have more stringent check. */ static struct kfd_topology_device *kfd_assign_gpu(struct kfd_dev *gpu) { @@ -1083,12 +1081,20 @@ static struct kfd_topology_device *kfd_assign_gpu(struct kfd_dev *gpu) struct kfd_topology_device *out_dev = NULL; down_write(&topology_lock); - list_for_each_entry(dev, &topology_device_list, list) + list_for_each_entry(dev, &topology_device_list, list) { + /* Discrete GPUs need their own topology device list + * entries. Don't assign them to CPU/APU nodes. + */ + if (!gpu->device_info->needs_iommu_device && + dev->node_props.cpu_cores_count) + continue; + if (!dev->gpu && (dev->node_props.simd_count > 0)) { dev->gpu = gpu; out_dev = dev; break; } + } up_write(&topology_lock); return out_dev; } -- 2.19.1