From patchwork Wed Mar 23 17:42:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 8652941 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 397069F36E for ; Wed, 23 Mar 2016 17:45:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 658C1203DB for ; Wed, 23 Mar 2016 17:45:28 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 8ADF7203E3 for ; Wed, 23 Mar 2016 17:45:27 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B6A616E91B; Wed, 23 Mar 2016 17:44:57 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qg0-x22c.google.com (mail-qg0-x22c.google.com [IPv6:2607:f8b0:400d:c04::22c]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7A4D56E8E0 for ; Wed, 23 Mar 2016 17:43:54 +0000 (UTC) Received: by mail-qg0-x22c.google.com with SMTP id y89so18137955qge.2 for ; Wed, 23 Mar 2016 10:43:54 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=lDvE+zFGGYR8X3Fd6NjVUOXMOUfwJJZY9JqrU1d2Aw0=; b=lvAWnXMnUJrx7GVJm0QPFHWqyf4/oJC8Aln4IJjMOyY2ELkkDvqYy4q48sfPGKGVUI BJWrvXOsKJoapFTGX7UaTY1EVIp48zw0zdaoH7Xd6th1oDfob8yMj+lZTnrbibPVcWyf VevoUAl09eiMK8ih/LTxRto4/x6HHwV8H5NDVEFkW1mVr4fYLAWVMr6Kr4HwrH3flZHd 7ZT1XylSzRpMdZtMveWqRKkGg7lWa5OwHcJqgb9c+/hU5NDwsLjl/5nITV2S/QPiGt3D jFj1CkizfIB4qG6cRLS2+Dz2jhy+XGV0XlML6ra86ImHhwVoP3IptjxL6be7gEp2gYuD z8AA== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=lDvE+zFGGYR8X3Fd6NjVUOXMOUfwJJZY9JqrU1d2Aw0=; b=Ehyuc8dmsKOTSrotlItpc0e+ZzPgmPSy1rKuqCBUlcv0cxuFkBZB9mtvJolypfjUCr 7D4qx0Gech6n/mVspYpXYfZQuP4SwyV/aVNCGPTnbBO3tXAA2XX3Duop/tsp6n3KWMqd fGW3OZBXuTO/KbAtTV0i2zAGEksf64/zE+zyh4tPtcxP1NqBqkxKZ2B7UyR8PxGRtjlM flDsxlpnYHSPMPmaafZy+WztQWB1MwFWu49bNUoj/ZJG84KT7FsAMcLKUj1LIo48cB8C hXNOCzJb/+gnjb8QnzrLM3lWxwFN+YGTochFDR/23qBILyg1UgT6ySOHwSNia8G1pjyu 7pwA== X-Gm-Message-State: AD7BkJItkJCHPDebvx492Stlp2l32aOkGZ6zSrweXWFMZ2WAqqC0MDaCMJpieWCiglmJig== X-Received: by 10.140.98.163 with SMTP id o32mr5404546qge.46.1458755032325; Wed, 23 Mar 2016 10:43:52 -0700 (PDT) Received: from cm.localdomain (static-74-96-105-49.washdc.fios.verizon.net. [74.96.105.49]) by smtp.gmail.com with ESMTPSA id v190sm1486878qka.46.2016.03.23.10.43.51 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 23 Mar 2016 10:43:51 -0700 (PDT) From: Alex Deucher X-Google-Original-From: Alex Deucher To: dri-devel@lists.freedesktop.org Subject: [PATCH 39/52] drm/amdgpu: ungate SMC clockgating first before suspend Date: Wed, 23 Mar 2016 13:42:55 -0400 Message-Id: <1458754988-16222-40-git-send-email-alexander.deucher@amd.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1458754988-16222-1-git-send-email-alexander.deucher@amd.com> References: <1458754988-16222-1-git-send-email-alexander.deucher@amd.com> MIME-Version: 1.0 Cc: Flora Cui 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: , 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: Flora Cui 46c34bcb6a15dd85329a39a5e72c62108626acdc put all block’s clockgating support in SMC. The sequence in suspend routine should be adjusted accordingly, otherwise it causes asic hang. Signed-off-by: Flora Cui Reviewed-by: Eric Huang --- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index 5ed7baf..e0c2e99 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -1340,14 +1340,23 @@ static int amdgpu_suspend(struct amdgpu_device *adev) { int i, r; + /* ungate SMC block first */ + r = amdgpu_set_clockgating_state(adev, AMD_IP_BLOCK_TYPE_SMC, + AMD_CG_STATE_UNGATE); + if (r) { + DRM_ERROR("set_clockgating_state(ungate) SMC failed %d\n",r); + } + for (i = adev->num_ip_blocks - 1; i >= 0; i--) { if (!adev->ip_block_status[i].valid) continue; /* ungate blocks so that suspend can properly shut them down */ - r = adev->ip_blocks[i].funcs->set_clockgating_state((void *)adev, - AMD_CG_STATE_UNGATE); - if (r) { - DRM_ERROR("set_clockgating_state(ungate) %d failed %d\n", i, r); + if (i != AMD_IP_BLOCK_TYPE_SMC) { + r = adev->ip_blocks[i].funcs->set_clockgating_state((void *)adev, + AMD_CG_STATE_UNGATE); + if (r) { + DRM_ERROR("set_clockgating_state(ungate) %d failed %d\n", i, r); + } } /* XXX handle errors */ r = adev->ip_blocks[i].funcs->suspend(adev);