From patchwork Fri May 13 21:36:08 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 9093751 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 32C6F9F1C3 for ; Fri, 13 May 2016 21:36:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 644A0200E9 for ; Fri, 13 May 2016 21:36:20 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 40D1C20114 for ; Fri, 13 May 2016 21:36:19 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6DC8C6E07E; Fri, 13 May 2016 21:36:17 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-io0-x244.google.com (mail-io0-x244.google.com [IPv6:2607:f8b0:4001:c06::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id B7DA56E07E for ; Fri, 13 May 2016 21:36:15 +0000 (UTC) Received: by mail-io0-x244.google.com with SMTP id d62so5646187iof.1 for ; Fri, 13 May 2016 14:36:15 -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=feIQ3lZQohGN6CJ2vz5w9cHZNkgD8Atwse3yTTAbwjg=; b=WS15xI9xVe2WUPU/TirrHCNcmi0iBD0ZTx2er44miIqmeb4q2SgmQqOQjEZLLFL7wz iGn4YWo1koY2RVVpnyHluAw43nnwjPLEPF981+UX1rJjubHz5DPQzmZBVUD+dzkY9Y3L chEyqbUtW5zDnE9ayJdQT7WNbYUGxzenO26AIjujvpXmsSL0yGhAlfWuxusRAIQ0+lRE XngjiljQ3fyZMiVrqtSp8gd8sdU9ljnHTfP7K7x63LgG8dROWsYvemYe8y9QhjvsMFod z/GfLnBfQJXXNBNzKJbdhjPWk6ZKlpK/9FDC/iLQSQAQqXQtagKL8sqqpne6/SLcn7QT eDAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=feIQ3lZQohGN6CJ2vz5w9cHZNkgD8Atwse3yTTAbwjg=; b=h58jkZMNhBWimOQ3XYJUbd5vXVK0MEBzVqd+c8Hzrt/B1PhAkqGEY7NOhZh8nvDZrM qygk4Ldjmv8TNIBdA/s2LKp8M6AO+RWvGR6SV8y+86AZatt65bpNCvMOZBdRDrlBkNJL q8nGvwQQLPfXikn1ykRu0Ee9pyOwJydvYNe5EYVwWD3ww8XQm+kNXc1+bpXkGVXIQpPz ryLFv7GrSWyHws3YMnOgn+KJR85i7EbxJ6Wzvms6e9C/ENY+lu+a59SGGRfmEVo+TGEK Plm/G658ScbhFEg9W1i36JZJtZPnAqgDRvWDwSPuhVXgZtnmVSeNtzd3M0W/e+0IQENq Zlmw== X-Gm-Message-State: AOPr4FVP+xx5nuxIiXM5EjYPjz0rd0qVy+UpTIfypIu8tAugnL9Jmq00reLeGUyoCNVP0Q== X-Received: by 10.107.160.76 with SMTP id j73mr12653582ioe.66.1463175375112; Fri, 13 May 2016 14:36:15 -0700 (PDT) Received: from cm.amd.com ([165.204.55.251]) by smtp.gmail.com with ESMTPSA id rn3sm1553183igb.14.2016.05.13.14.36.13 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 13 May 2016 14:36:14 -0700 (PDT) From: Alex Deucher X-Google-Original-From: Alex Deucher To: dri-devel@lists.freedesktop.org Subject: [PATCH 3.5/6] drm/amd/powerplay: fix bugs of checking if dpm is running on Tonga Date: Fri, 13 May 2016 17:36:08 -0400 Message-Id: <1463175368-27642-1-git-send-email-alexander.deucher@amd.com> X-Mailer: git-send-email 2.5.5 Cc: Eric Huang , Alex Deucher 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.7 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RCVD_IN_SORBS_WEB, 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 From: Eric Huang Fixes OD failures on Tonga. Reviewed-by: Alex Deucher Signed-off-by: Eric Huang Signed-off-by: Alex Deucher --- This fixes OD failures on Tonga in some cases. drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.c index cb28335..7c3f82b 100644 --- a/drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.c +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.c @@ -5331,7 +5331,7 @@ static int tonga_freeze_sclk_mclk_dpm(struct pp_hwmgr *hwmgr) (data->need_update_smu7_dpm_table & (DPMTABLE_OD_UPDATE_SCLK + DPMTABLE_UPDATE_SCLK))) { PP_ASSERT_WITH_CODE( - true == tonga_is_dpm_running(hwmgr), + 0 == tonga_is_dpm_running(hwmgr), "Trying to freeze SCLK DPM when DPM is disabled", ); PP_ASSERT_WITH_CODE( @@ -5344,7 +5344,7 @@ static int tonga_freeze_sclk_mclk_dpm(struct pp_hwmgr *hwmgr) if ((0 == data->mclk_dpm_key_disabled) && (data->need_update_smu7_dpm_table & DPMTABLE_OD_UPDATE_MCLK)) { - PP_ASSERT_WITH_CODE(true == tonga_is_dpm_running(hwmgr), + PP_ASSERT_WITH_CODE(0 == tonga_is_dpm_running(hwmgr), "Trying to freeze MCLK DPM when DPM is disabled", ); PP_ASSERT_WITH_CODE( @@ -5647,7 +5647,7 @@ static int tonga_unfreeze_sclk_mclk_dpm(struct pp_hwmgr *hwmgr) (data->need_update_smu7_dpm_table & (DPMTABLE_OD_UPDATE_SCLK + DPMTABLE_UPDATE_SCLK))) { - PP_ASSERT_WITH_CODE(true == tonga_is_dpm_running(hwmgr), + PP_ASSERT_WITH_CODE(0 == tonga_is_dpm_running(hwmgr), "Trying to Unfreeze SCLK DPM when DPM is disabled", ); PP_ASSERT_WITH_CODE( @@ -5661,7 +5661,7 @@ static int tonga_unfreeze_sclk_mclk_dpm(struct pp_hwmgr *hwmgr) (data->need_update_smu7_dpm_table & DPMTABLE_OD_UPDATE_MCLK)) { PP_ASSERT_WITH_CODE( - true == tonga_is_dpm_running(hwmgr), + 0 == tonga_is_dpm_running(hwmgr), "Trying to Unfreeze MCLK DPM when DPM is disabled", ); PP_ASSERT_WITH_CODE(