From patchwork Tue May 19 14:05:22 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oded Gabbay X-Patchwork-Id: 6438111 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id B7E4EC0432 for ; Tue, 19 May 2015 14:06:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0EC262052F for ; Tue, 19 May 2015 14:05:58 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id E7A16204B0 for ; Tue, 19 May 2015 14:05:53 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3113A6E650; Tue, 19 May 2015 07:05:53 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=8yWUUMvTnaIQ/z6VcBfeitjaDryjf4hGStzRLLiKatE=; b=r3Lf3vINqRY58/XWhlTxdFKkQs/18gx93qPthSG8leQ0S8Y0d116XJgqZQkltdKegv r+WPZF2vG5XhN6i/VrmtGA2MPebSkVSZ5rok1M9K7ekjOlBrDt6jp2XNXdjWhSmn06kI JqY+pAzZ77Jt8QYzVoil2LdcdVCCJiDAd8m+ZGN/VxiO/dzQDitVMMuCiwr7I7fxNsbR j8XItlgmh3KAXRWXJu11Xs8ykDGPszSC/OH2SuP3tVrU9Td1LNtOsDV3mQkN0SPyFOeg cZvPvfvQHpQY10TIyfDkTHyMQEU02E7wkzFvFzggY7JJO07OIAwwpdP5opTTsUH54cio Qi/g== X-Received: by 10.202.104.88 with SMTP id d85mr3756204oic.37.1432044350767; Tue, 19 May 2015 07:05:50 -0700 (PDT) Received: from tlv-gabbay-ws.amd.com ([2.52.173.208]) by mx.google.com with ESMTPSA id yw8sm8154801obb.29.2015.05.19.07.05.47 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 19 May 2015 07:05:50 -0700 (PDT) From: Oded Gabbay To: dri-devel@lists.freedesktop.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> X-Mailer: git-send-email 1.9.1 Cc: Alexey Skidanov , stable@vger.kernel.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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",