From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Vesely Subject: Re: [PATCH 1/1] drm/radeon: Fix cleanup error path. Date: Wed, 04 Mar 2015 20:13:23 -0500 Message-ID: <1425518003.10882.0.camel@rutgers.edu> References: <1425503403-5277-1-git-send-email-jan.vesely@rutgers.edu> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1359709158==" Return-path: Received: from mail-qc0-f182.google.com (mail-qc0-f182.google.com [209.85.216.182]) by gabe.freedesktop.org (Postfix) with ESMTP id F03A26E2F3 for ; Wed, 4 Mar 2015 17:13:24 -0800 (PST) Received: by qcvs11 with SMTP id s11so6568834qcv.7 for ; Wed, 04 Mar 2015 17:13:24 -0800 (PST) In-Reply-To: <1425503403-5277-1-git-send-email-jan.vesely@rutgers.edu> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org Cc: Michel Danzer List-Id: dri-devel@lists.freedesktop.org --===============1359709158== Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-5K3Y8Fh1FrCCFt0amQDS" --=-5K3Y8Fh1FrCCFt0amQDS Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable please ignore this patch, see bugzilla for details. sorry for the noise. On Wed, 2015-03-04 at 16:10 -0500, Jan Vesely wrote: > cleanup: target is called before fence_get > Fixes hangs on GPU reset on Turks GPU. >=20 > regression introduced by: > commit dd7cfd641228abb2669d8d047d5ec377b1835900 > Author: Maarten Lankhorst > Date: Tue Jan 21 13:07:31 2014 +0100 >=20 > drm/ttm: kill fence_lock > =20 > No users are left, kill it off! :D > Conversion to the reservation api is next on the list, after > that the functionality can be restored with rcu. > =20 > Signed-off-by: Maarten Lankhorst >=20 > CC: stable@vger.kernel.org > Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=3D94081 > Signed-off-by: Jan Vesely > --- > drivers/gpu/drm/radeon/radeon_display.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) >=20 > diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/ra= deon/radeon_display.c > index 00ead8c..89a8c48 100644 > --- a/drivers/gpu/drm/radeon/radeon_display.c > +++ b/drivers/gpu/drm/radeon/radeon_display.c > @@ -573,6 +573,7 @@ vblank_cleanup: > drm_vblank_put(crtc->dev, radeon_crtc->crtc_id); > =20 > pflip_cleanup: > + fence_put(work->fence); > if (unlikely(radeon_bo_reserve(new_rbo, false) !=3D 0)) { > DRM_ERROR("failed to reserve new rbo in error path\n"); > goto cleanup; > @@ -584,7 +585,6 @@ pflip_cleanup: > =20 > cleanup: > drm_gem_object_unreference_unlocked(&work->old_rbo->gem_base); > - fence_put(work->fence); > kfree(work); > return r; > } --=20 Jan Vesely --=-5K3Y8Fh1FrCCFt0amQDS Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAABCgAGBQJU962zAAoJEOCQZixVs7KBUekQAMJaD0GAwddlpZ/DrG/zIB/i VY6k7luZqbWa/SUSLj2zBftJR33w7sKoYlIpR+/gHRu7a3kWaz0YPNQN+XbnfeO9 XUIKLw+Ga/jfMV97QSGcnggOfRawc91ETS9UnDpi//pCNrLkmQtDYaODSaOoyVsQ 2TsyN8rk2EFSFQLKOTi9m20ZE+zQeggrlYqfqvpCRjI2Du+3IEDJPXHp/K9KFAC6 twhzIVHeJ1leqd9zrYCz/REU/p2LwzJ62ETnZtfVDVDgH8jXFmYFmaIKy4a9bFa8 uZZG0zfgZIfTONp1yeocfnWSUSGfxgwSTxPjjcxa9r/3LmVKlzPZ1SjshnkDgsAq v2H68TL3p+2c1KnLNOF55Nt98Yg08MbxYfp8acAoc4s6UbwDPkcl1USIrPG5eqql 5YLyTAl1Szlw7xMH5Do+JquK5y50pfWWf4xfXxsQNpGfRMELcUgSN0HC+4hQRXEl 3RtwLoUvEe2v+Re+AhchIJoofph1NSX6CWEikVV6XA8g3+98N6lJbmkn41GlTBG6 ltZcMoxndL0SCNBmKKGSLywtDHMfZBpRsCQj+mIssPtHzGBQaJslVbh1mnD4N8VW LNxD2c8jURjTFdCIcFnDU2VY9NwmU4dwuWWIzWGPSKblwD6lHSitDqwGqyeoTo3K jU9Yo10m8NBoGAx/iPKP =pdEq -----END PGP SIGNATURE----- --=-5K3Y8Fh1FrCCFt0amQDS-- --===============1359709158== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVs IG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHA6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK --===============1359709158==--