From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thierry Reding Subject: Re: [PATCH] drm/cma-helper: fixup compilation Date: Tue, 19 Feb 2013 11:22:22 +0100 Message-ID: <20130219102222.GA21321@avionic-0098.mockup.avionic-design.de> References: <20130219074339.GA5456@avionic-0098.mockup.avionic-design.de> <1361269084-31767-1-git-send-email-daniel.vetter@ffwll.ch> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1368236577==" Return-path: Received: from moutng.kundenserver.de (moutng.kundenserver.de [212.227.17.10]) by gabe.freedesktop.org (Postfix) with ESMTP id 8497EE60E8 for ; Tue, 19 Feb 2013 02:22:32 -0800 (PST) In-Reply-To: <1361269084-31767-1-git-send-email-daniel.vetter@ffwll.ch> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org Errors-To: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org To: Daniel Vetter Cc: DRI Development List-Id: dri-devel@lists.freedesktop.org --===============1368236577== Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="mP3DRpeJDSE+ciuQ" Content-Disposition: inline --mP3DRpeJDSE+ciuQ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Feb 19, 2013 at 11:18:04AM +0100, Daniel Vetter wrote: > /me grabs a few brown paper bags >=20 > So it looks like I've broken compilation in >=20 > commit 6aed8ec3f76a22217c9ae183d32b1aa990bed069 > Author: Daniel Vetter > Date: Sun Jan 20 17:32:21 2013 +0100 >=20 > drm: review locking for drm_fb_helper_restore_fbdev_mode >=20 > Fix it up again. >=20 > v2: Only deref fbdev_cma once we're sure it's non-NULL, noticed by > Thierry Reding. >=20 > Reported-by: Wu Fengguang > Signed-off-by: Daniel Vetter > --- > drivers/gpu/drm/drm_fb_cma_helper.c | 9 ++++++--- > 1 file changed, 6 insertions(+), 3 deletions(-) >=20 > diff --git a/drivers/gpu/drm/drm_fb_cma_helper.c b/drivers/gpu/drm/drm_fb= _cma_helper.c > index e851658..1c8549d 100644 > --- a/drivers/gpu/drm/drm_fb_cma_helper.c > +++ b/drivers/gpu/drm/drm_fb_cma_helper.c > @@ -377,10 +377,13 @@ EXPORT_SYMBOL_GPL(drm_fbdev_cma_fini); > */ > void drm_fbdev_cma_restore_mode(struct drm_fbdev_cma *fbdev_cma) > { > - drm_modeset_lock_all(dev); > - if (fbdev_cma) > + if (fbdev_cma) { > + struct drm_device *dev =3D fbdev_cma->fb_helper.dev; > + > + drm_modeset_lock_all(dev); > drm_fb_helper_restore_fbdev_mode(&fbdev_cma->fb_helper); > - drm_modeset_unlock_all(dev); > + drm_modeset_unlock_all(dev); > + } > } > EXPORT_SYMBOL_GPL(drm_fbdev_cma_restore_mode); > =20 Reviewed-by: Thierry Reding --mP3DRpeJDSE+ciuQ Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) iQIcBAEBAgAGBQJRI1JeAAoJEN0jrNd/PrOhLasQAJvbWn9mwvlLR4E3zAI2fgoQ e83837FkifnBYsWSM9ZvxjX9Ex9MDAsVBvO5DnujdbQYajPgbfXhZ2yADP2l5xTA KGUv3ekDPwF5qprcdxCjqVgZHZqNFhKp5FZbvi0SG74laKK5GwIp2MuvOsPiAg21 ot3dsJmGNBogDy5Ngo7LeJUIj1xih9iiykZC6Y0Ek846Q1f/V4ENBtudNjtB29J8 EO0K6QpHyhfPCZNVwXng2pvUqcEIoPMJt2eu5l4+AwwLSo/oeznliDSUvdTu9DPm mo7eZ2F1AaVeNSGmrTyJJKELZTzdCGHzG6CkLsF6nTvynH9cElwi6W7VL3sv5zef kwZIEfTxNWXVjG7mRc/VQpCHBIse77K/aqJ1yrkeoFiTerzypBQ7PDUVe1EZhi0w Kgb2QneMwnvGQoNZKsQWfgZxGu71zmGPcSUET61Dxi1u3oMv0ZSk4ogWnwdxzM+9 BZRquQsO1EtpPlSHtf7XnIRJRbBRhbkV32kGE16bJx1Uwp6zNkZBIYNznOTURm7z +gM2wLuMo2WwrbgbIY7DtUGTuAOy2aIYkTLPETKRjX593CPq3fRbWbakZvrY4iA+ twptFz6WzmuIvaTSjs+vq6BBrzX+23SrhLKJSFobGUwOviUhUGC0kf5ASOFW2y81 61AlDbHUOmPpySZhLrb3 =oUbF -----END PGP SIGNATURE----- --mP3DRpeJDSE+ciuQ-- --===============1368236577== 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 --===============1368236577==--