From patchwork Wed Jul 29 07:44: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: 6890151 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id A025D9F380 for ; Wed, 29 Jul 2015 07:44:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C79A0207D7 for ; Wed, 29 Jul 2015 07:44:31 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 0969E207D1 for ; Wed, 29 Jul 2015 07:44:31 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6D9B46E8C4; Wed, 29 Jul 2015 00:44:29 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wi0-f181.google.com (mail-wi0-f181.google.com [209.85.212.181]) by gabe.freedesktop.org (Postfix) with ESMTPS id E4B816E8C4 for ; Wed, 29 Jul 2015 00:44:27 -0700 (PDT) Received: by wibxm9 with SMTP id xm9so188326976wib.0 for ; Wed, 29 Jul 2015 00:44:26 -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=S9IVp3VHezYu28vAjxpQ/Pl3zQxdmrO3LDkp4XpMtDQ=; b=PrnR931xGmWOVuK121UIjvPSxR9cAiIIwLENNOlM1DbbbiLMCHTtiC83+Wc0k87uf2 opUnxE+40AMzD5DA4Hrk8jblU0YyY06MI08nA4fLsQCobqj6g4lBEXrKtjHcua//EEeS rGrLoLgZwA5igijJ27N6mSfzwDEPGYiX1vS3m/73LuOrNXvrg4A5NKuh3NFuYNFI5Hq7 cuz8Rn2AvJMrO5XkIhWvO/Aq5XWUQMwl8nNPtm0b0wewY+w3IME9U8W21+n10Nkrhgrd G9QIjF/BCBaJAT9bGl79VOwGRitIyhlp6JuyJb+EdczN2ImqIXTBJ4Oe7dkLbK7uGGn6 RJhA== X-Received: by 10.180.21.175 with SMTP id w15mr15252174wie.58.1438155866388; Wed, 29 Jul 2015 00:44:26 -0700 (PDT) Received: from odedg-tlv.tlv.redhat.com (nat-pool-tlv-t.redhat.com. [209.132.186.36]) by smtp.gmail.com with ESMTPSA id qq1sm37105611wjc.0.2015.07.29.00.44.25 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 29 Jul 2015 00:44:25 -0700 (PDT) From: Oded Gabbay To: dri-devel@lists.freedesktop.org Subject: [PATCH 1/2] drm/amdgpu: fix bug when amdkfd destroys hqd Date: Wed, 29 Jul 2015 10:44:22 +0300 Message-Id: <1438155863-9187-1-git-send-email-oded.gabbay@gmail.com> X-Mailer: git-send-email 2.4.3 Cc: dan.carpenter@oracle.com 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=-5.5 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, 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 The wrong define was used to check if the hqd is still active Signed-off-by: Oded Gabbay --- drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c index 2daad33..6a45330 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c @@ -450,7 +450,8 @@ static int kgd_hqd_destroy(struct kgd_dev *kgd, uint32_t reset_type, while (true) { temp = RREG32(mmCP_HQD_ACTIVE); - if (temp & CP_HQD_ACTIVE__ACTIVE__SHIFT) + if (temp & (CP_HQD_ACTIVE__ACTIVE_MASK << + CP_HQD_ACTIVE__ACTIVE__SHIFT)) break; if (timeout == 0) { pr_err("kfd: cp queue preemption time out (%dms)\n",