From patchwork Tue Jun 7 21:51:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jerome Glisse X-Patchwork-Id: 9162653 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 414B160801 for ; Tue, 7 Jun 2016 21:52:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 313102835C for ; Tue, 7 Jun 2016 21:52:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 25F452836C; Tue, 7 Jun 2016 21:52:33 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C188A28365 for ; Tue, 7 Jun 2016 21:52:32 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 59E806E860; Tue, 7 Jun 2016 21:52:27 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mx5-phx2.redhat.com (mx5-phx2.redhat.com [209.132.183.37]) by gabe.freedesktop.org (Postfix) with ESMTPS id 62A496E860 for ; Tue, 7 Jun 2016 21:52:25 +0000 (UTC) Received: from zmail17.collab.prod.int.phx2.redhat.com (zmail17.collab.prod.int.phx2.redhat.com [10.5.83.19]) by mx5-phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u57LpqQa051372; Tue, 7 Jun 2016 17:51:52 -0400 Date: Tue, 7 Jun 2016 17:51:52 -0400 (EDT) From: Jerome Glisse To: Borislav Petkov Message-ID: <1734348573.4433814.1465336312228.JavaMail.zimbra@redhat.com> In-Reply-To: <20160606220003.GH4206@pd.tnic> References: <20160606140202.GA4206@pd.tnic> <159981777.3992038.1465249219590.JavaMail.zimbra@redhat.com> <20160606220003.GH4206@pd.tnic> Subject: Re: 274ad65c9d02 ("drm/radeon: hard reset r600 and newer GPU when hibernating.") MIME-Version: 1.0 X-Originating-IP: [10.10.61.191] X-Mailer: Zimbra 8.0.6_GA_5922 (ZimbraWebClient - FF42 (Linux)/8.0.6_GA_5922) Thread-Topic: 274ad65c9d02 ("drm/radeon: hard reset r600 and newer GPU when hibernating.") Thread-Index: 9EzVHaVyLGwA/80csOPC3AlPzQsAww== Cc: Alex Deucher , Christian =?utf-8?Q?K=C3=B6nig?= , dri-devel@lists.freedesktop.org, lkml 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-Virus-Scanned: ClamAV using ClamSMTP > On Mon, Jun 06, 2016 at 05:40:19PM -0400, Jerome Glisse wrote: > > Brokens how ? Symptoms ? > > Whoops, sorry, I meant to elaborate... > > After doing: > > echo "shutdown" > /sys/power/disk > echo "disk" > /sys/power/state > > screen goes blank but machine remains powered on and doesn't go off. No > responses to keyboard presses, etc. The only thing left to do is the > reset button. Ok i don't have too much time to dig into r600 i assume that r700 breaks the same way so could you verify that attached patch fix the issue for you. Note that video decoding is likely broken for you after hibernation but you might have never notice it. Cheers, Jérôme From 8ed42906e430880ce01bc6f175f1c7c180529353 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Glisse?= Date: Tue, 7 Jun 2016 17:43:04 -0400 Subject: [PATCH] drm/radeon: do not hard reset GPU while freezing on r600/r700 family MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Seems r600/r700 does not like hard reset while freezing for hibernation (regression due to 274ad65c9d02bdcbee9bae045517864c3521d530 which itself is a fix for hibernation on some GPU families). Until i can debug further issue with r600, let just disable this for r600/r700 as they are very similar family and bug affecting one likely affect the other. Signed-off-by: Jérôme Glisse --- drivers/gpu/drm/radeon/radeon_device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c index e721e6b..e61c763 100644 --- a/drivers/gpu/drm/radeon/radeon_device.c +++ b/drivers/gpu/drm/radeon/radeon_device.c @@ -1631,7 +1631,7 @@ int radeon_suspend_kms(struct drm_device *dev, bool suspend, radeon_agp_suspend(rdev); pci_save_state(dev->pdev); - if (freeze && rdev->family >= CHIP_R600) { + if (freeze && rdev->family >= CHIP_CEDAR) { rdev->asic->asic_reset(rdev, true); pci_restore_state(dev->pdev); } else if (suspend) { -- 2.1.0