From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C67D0C54FCB for ; Mon, 20 Apr 2020 12:51:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9C62C206D4 for ; Mon, 20 Apr 2020 12:51:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587387105; bh=1NfLBfy5ig5bHPBuxtRQkFN4mZIt4JKhzWxZE9M2dHg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=YKZo8WxoEAxf/vi5yh5c5Vm+sq9d7lHInYvI7XVIwAWEM5gqkjab+kBWlnBuLEFHq hd+dnNHka4dwOAzeAjtqPFNZOIqfZ9AScz3BRaa67y/eHYxPsnTV3eoL3+FofmdYbk hhHqtx6vYnVZuHoLsKSvv2UFwWcD2U5XGqcVeScc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729199AbgDTMsL (ORCPT ); Mon, 20 Apr 2020 08:48:11 -0400 Received: from mail.kernel.org ([198.145.29.99]:44614 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729193AbgDTMsH (ORCPT ); Mon, 20 Apr 2020 08:48:07 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C2CB5206DD; Mon, 20 Apr 2020 12:48:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587386887; bh=1NfLBfy5ig5bHPBuxtRQkFN4mZIt4JKhzWxZE9M2dHg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DAR8zdUubllagQn25MwTRbFaKcFbqudbUta9Gt/y4rZfNgdrODkIlqo6z50SBQBSw ilCcQstRY8z3S6U93rRKRC4A1qDiN7v5anbrdywH/Zq9tqaA7qOpxAjyENkPm/HMdQ rNucuPbqdehXmMJ8pDz9LmxdK7rd90sJHcFG3B54= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Prike Liang , Mengbing Wang , Paul Menzel , Alex Deucher Subject: [PATCH 5.4 52/60] drm/amdgpu: fix the hw hang during perform system reboot and reset Date: Mon, 20 Apr 2020 14:39:30 +0200 Message-Id: <20200420121514.345458607@linuxfoundation.org> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200420121500.490651540@linuxfoundation.org> References: <20200420121500.490651540@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Prike Liang commit b2a7e9735ab2864330be9d00d7f38c961c28de5d upstream. The system reboot failed as some IP blocks enter power gate before perform hw resource destory. Meanwhile use unify interface to set device CGPG to ungate state can simplify the amdgpu poweroff or reset ungate guard. Fixes: 487eca11a321ef ("drm/amdgpu: fix gfx hang during suspend with video playback (v2)") Signed-off-by: Prike Liang Tested-by: Mengbing Wang Tested-by: Paul Menzel Acked-by: Alex Deucher Signed-off-by: Alex Deucher Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 ++ 1 file changed, 2 insertions(+) --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -2176,6 +2176,8 @@ static int amdgpu_device_ip_suspend_phas { int i, r; + amdgpu_device_set_pg_state(adev, AMD_PG_STATE_UNGATE); + amdgpu_device_set_cg_state(adev, AMD_CG_STATE_UNGATE); for (i = adev->num_ip_blocks - 1; i >= 0; i--) { if (!adev->ip_blocks[i].status.valid)