From mboxrd@z Thu Jan 1 00:00:00 1970 From: Oded Gabbay Subject: [PATCH] drm/amdkfd: fix topology bug with capability attr. Date: Tue, 19 May 2015 17:05:22 +0300 Message-ID: <1432044322-6115-1-git-send-email-oded.gabbay@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-oi0-f41.google.com (mail-oi0-f41.google.com [209.85.218.41]) by gabe.freedesktop.org (Postfix) with ESMTP id 4F41D6E658 for ; Tue, 19 May 2015 07:05:51 -0700 (PDT) Received: by oihb9 with SMTP id b9so11534901oih.3 for ; Tue, 19 May 2015 07:05:50 -0700 (PDT) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org Cc: Alexey Skidanov , stable@vger.kernel.org List-Id: dri-devel@lists.freedesktop.org RnJvbTogQWxleGV5IFNraWRhbm92IDxBbGV4ZXkuU2tpZGFub3ZAYW1kLmNvbT4KClRoaXMgcGF0 Y2ggZml4ZXMgYSBidWcgd2hlcmUgdGhlIG51bWJlciBvZiB3YXRjaCBwb2ludHMKd2FzIHNob3du IGJlZm9yZSBpdCB3YXMgYWN0dWFsbHkgY2FsY3VsYXRlZAoKU2lnbmVkLW9mZi1ieTogQWxleGV5 IFNraWRhbm92IDxBbGV4ZXkuU2tpZGFub3ZAYW1kLmNvbT4KQ2M6IHN0YWJsZUB2Z2VyLmtlcm5l bC5vcmcKU2lnbmVkLW9mZi1ieTogT2RlZCBHYWJiYXkgPG9kZWQuZ2FiYmF5QGdtYWlsLmNvbT4K LS0tCiBkcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGtmZC9rZmRfdG9wb2xvZ3kuYyB8IDQgKystLQog MSBmaWxlIGNoYW5nZWQsIDIgaW5zZXJ0aW9ucygrKSwgMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS9kcml2ZXJzL2dwdS9kcm0vYW1kL2FtZGtmZC9rZmRfdG9wb2xvZ3kuYyBiL2RyaXZlcnMv Z3B1L2RybS9hbWQvYW1ka2ZkL2tmZF90b3BvbG9neS5jCmluZGV4IGU0NjljNGIuLmMyNTcyOGIg MTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1ka2ZkL2tmZF90b3BvbG9neS5jCisr KyBiL2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1ka2ZkL2tmZF90b3BvbG9neS5jCkBAIC02ODQsOCAr Njg0LDYgQEAgc3RhdGljIHNzaXplX3Qgbm9kZV9zaG93KHN0cnVjdCBrb2JqZWN0ICprb2JqLCBz dHJ1Y3QgYXR0cmlidXRlICphdHRyLAogCQkJZGV2LT5ub2RlX3Byb3BzLmNwdV9jb3JlX2lkX2Jh c2UpOwogCXN5c2ZzX3Nob3dfMzJiaXRfcHJvcChidWZmZXIsICJzaW1kX2lkX2Jhc2UiLAogCQkJ ZGV2LT5ub2RlX3Byb3BzLnNpbWRfaWRfYmFzZSk7Ci0Jc3lzZnNfc2hvd18zMmJpdF9wcm9wKGJ1 ZmZlciwgImNhcGFiaWxpdHkiLAotCQkJZGV2LT5ub2RlX3Byb3BzLmNhcGFiaWxpdHkpOwogCXN5 c2ZzX3Nob3dfMzJiaXRfcHJvcChidWZmZXIsICJtYXhfd2F2ZXNfcGVyX3NpbWQiLAogCQkJZGV2 LT5ub2RlX3Byb3BzLm1heF93YXZlc19wZXJfc2ltZCk7CiAJc3lzZnNfc2hvd18zMmJpdF9wcm9w KGJ1ZmZlciwgImxkc19zaXplX2luX2tiIiwKQEAgLTczNiw2ICs3MzQsOCBAQCBzdGF0aWMgc3Np emVfdCBub2RlX3Nob3coc3RydWN0IGtvYmplY3QgKmtvYmosIHN0cnVjdCBhdHRyaWJ1dGUgKmF0 dHIsCiAJCQlkZXYtPmdwdS0+a2ZkMmtnZC0+Z2V0X2Z3X3ZlcnNpb24oCiAJCQkJCQlkZXYtPmdw dS0+a2dkLAogCQkJCQkJS0dEX0VOR0lORV9NRUMxKSk7CisJCXN5c2ZzX3Nob3dfMzJiaXRfcHJv cChidWZmZXIsICJjYXBhYmlsaXR5IiwKKwkJCQlkZXYtPm5vZGVfcHJvcHMuY2FwYWJpbGl0eSk7 CiAJfQogCiAJcmV0dXJuIHN5c2ZzX3Nob3dfMzJiaXRfcHJvcChidWZmZXIsICJtYXhfZW5naW5l X2Nsa19jY29tcHV0ZSIsCi0tIAoxLjkuMQoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMu ZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0 aW5mby9kcmktZGV2ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ob0-f176.google.com ([209.85.214.176]:34911 "EHLO mail-ob0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756147AbbESOFv (ORCPT ); Tue, 19 May 2015 10:05:51 -0400 Received: by obcus9 with SMTP id us9so12852082obc.2 for ; Tue, 19 May 2015 07:05:50 -0700 (PDT) From: Oded Gabbay To: dri-devel@lists.freedesktop.org Cc: Alexey Skidanov , stable@vger.kernel.org Subject: [PATCH] drm/amdkfd: fix topology bug with capability attr. Date: Tue, 19 May 2015 17:05:22 +0300 Message-Id: <1432044322-6115-1-git-send-email-oded.gabbay@gmail.com> Sender: stable-owner@vger.kernel.org List-ID: From: Alexey Skidanov This patch fixes a bug where the number of watch points was shown before it was actually calculated Signed-off-by: Alexey Skidanov Cc: stable@vger.kernel.org Signed-off-by: Oded Gabbay --- drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c index e469c4b..c25728b 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c @@ -684,8 +684,6 @@ static ssize_t node_show(struct kobject *kobj, struct attribute *attr, dev->node_props.cpu_core_id_base); sysfs_show_32bit_prop(buffer, "simd_id_base", dev->node_props.simd_id_base); - sysfs_show_32bit_prop(buffer, "capability", - dev->node_props.capability); sysfs_show_32bit_prop(buffer, "max_waves_per_simd", dev->node_props.max_waves_per_simd); sysfs_show_32bit_prop(buffer, "lds_size_in_kb", @@ -736,6 +734,8 @@ static ssize_t node_show(struct kobject *kobj, struct attribute *attr, dev->gpu->kfd2kgd->get_fw_version( dev->gpu->kgd, KGD_ENGINE_MEC1)); + sysfs_show_32bit_prop(buffer, "capability", + dev->node_props.capability); } return sysfs_show_32bit_prop(buffer, "max_engine_clk_ccompute", -- 1.9.1