From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?B?Q2hyaXN0aWFuIEvDtm5pZw==?= Subject: Re: [PATCH 1/5] drm/radeon: rework and fix reset detection v2 Date: Tue, 05 Nov 2013 14:09:04 +0100 Message-ID: <5278EDF0.2000503@vodafone.de> References: <1383074091-2524-1-git-send-email-deathsimple@vodafone.de> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------000801000409040809050101" Return-path: Received: from pegasos-out.vodafone.de (pegasos-out.vodafone.de [80.84.1.38]) by gabe.freedesktop.org (Postfix) with ESMTP id 62C9CEFC85 for ; Tue, 5 Nov 2013 05:09:09 -0800 (PST) In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org To: =?UTF-8?B?UmFmYcWCIE1pxYJlY2tp?= Cc: dri-devel List-Id: dri-devel@lists.freedesktop.org This is a multi-part message in MIME format. --------------000801000409040809050101 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable Am 03.11.2013 13:15, schrieb Rafa=C5=82 Mi=C5=82ecki: > 2013/10/29 Christian K=C3=B6nig : >> From: Christian K=C3=B6nig >> >> Stop fiddling with jiffies, always wait for RADEON_FENCE_JIFFIES_TIMEO= UT. >> Consolidate the two wait sequence implementations into just one functi= on. >> Activate all waiters and remember if the reset was already done instea= d of >> trying to reset from only one thread. > With this patch I can't suspend my Samsung with: > 01:00.0 VGA compatible controller [0300]: Advanced Micro Devices [AMD] > nee ATI Blackcomb [Radeon HD 6900M series] [1002:6720] > anymore. > > The backlight goes off, activity LED goes off and then nothing. > Machine is still running and other lights (power, wifi, keyboard, > touchpad) are still working. Seems like a lockup to me. Does the attached patch help? Cheers, Christian. --------------000801000409040809050101 Content-Type: text/x-diff; name="0001-drm-radeon-fix-radeon_fence_wait_empty_locked.patch" Content-Disposition: attachment; filename="0001-drm-radeon-fix-radeon_fence_wait_empty_locked.patch" Content-Transfer-Encoding: quoted-printable >>From ae595cb2728002781c952b43bdab471be2466428 Mon Sep 17 00:00:00 2001 From: =3D?UTF-8?q?Christian=3D20K=3DC3=3DB6nig?=3D Date: Mon, 4 Nov 2013 16:50:51 +0100 Subject: [PATCH] drm/radeon: fix radeon_fence_wait_empty_locked MIME-Version: 1.0 Content-Type: text/plain; charset=3DUTF-8 Content-Transfer-Encoding: 8bit Don't block forever if there is nothing to wait for. Signed-off-by: Christian K=C3=B6nig --- drivers/gpu/drm/radeon/radeon_fence.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/radeon/radeon_fence.c b/drivers/gpu/drm/rade= on/radeon_fence.c index b8f68b2..281d14c 100644 --- a/drivers/gpu/drm/radeon/radeon_fence.c +++ b/drivers/gpu/drm/radeon/radeon_fence.c @@ -510,6 +510,9 @@ int radeon_fence_wait_empty_locked(struct radeon_devi= ce *rdev, int ring) int r; =20 seq[ring] =3D rdev->fence_drv[ring].sync_seq[ring]; + if (!seq[ring]) + return 0; + r =3D radeon_fence_wait_seq(rdev, seq, false, false); if (r) { if (r =3D=3D -EDEADLK) --=20 1.8.1.2 --------------000801000409040809050101 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/dri-devel --------------000801000409040809050101--