From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rodrigo Siqueira Subject: Re: [PATCH 16/17] drm/vkms: Convert to using __drm_atomic_helper_crtc_reset() for reset. Date: Wed, 6 Mar 2019 19:43:17 -0300 Message-ID: <20190306224317.ua2ezrjaitxj3ibk@smtp.gmail.com> References: <20190301125627.7285-1-maarten.lankhorst@linux.intel.com> <20190301125627.7285-17-maarten.lankhorst@linux.intel.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0709104612==" Return-path: In-Reply-To: <20190301125627.7285-17-maarten.lankhorst@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Maarten Lankhorst Cc: Haneen Mohammed , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org --===============0709104612== Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="huhwqr3x3oerr67f" Content-Disposition: inline --huhwqr3x3oerr67f Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On 03/01, Maarten Lankhorst wrote: > Convert vkms to using __drm_atomic_helper_crtc_reset(), instead of > writing its own version. Instead of open coding destroy_state(), > call it directly for freeing the old state. >=20 > Signed-off-by: Maarten Lankhorst > Cc: Rodrigo Siqueira > Cc: Haneen Mohammed > Cc: Daniel Vetter > --- > drivers/gpu/drm/vkms/vkms_crtc.c | 33 +++++++++++++------------------- > 1 file changed, 13 insertions(+), 20 deletions(-) >=20 > diff --git a/drivers/gpu/drm/vkms/vkms_crtc.c b/drivers/gpu/drm/vkms/vkms= _crtc.c > index 8a9aeb0a9ea8..550888e72c96 100644 > --- a/drivers/gpu/drm/vkms/vkms_crtc.c > +++ b/drivers/gpu/drm/vkms/vkms_crtc.c > @@ -83,26 +83,6 @@ bool vkms_get_vblank_timestamp(struct drm_device *dev,= unsigned int pipe, > return true; > } > =20 > -static void vkms_atomic_crtc_reset(struct drm_crtc *crtc) > -{ > - struct vkms_crtc_state *vkms_state =3D NULL; > - > - if (crtc->state) { > - vkms_state =3D to_vkms_crtc_state(crtc->state); > - __drm_atomic_helper_crtc_destroy_state(crtc->state); > - kfree(vkms_state); > - crtc->state =3D NULL; > - } > - > - vkms_state =3D kzalloc(sizeof(*vkms_state), GFP_KERNEL); > - if (!vkms_state) > - return; > - INIT_WORK(&vkms_state->crc_work, vkms_crc_work_handle); > - > - crtc->state =3D &vkms_state->base; > - crtc->state->crtc =3D crtc; > -} > - > static struct drm_crtc_state * > vkms_atomic_crtc_duplicate_state(struct drm_crtc *crtc) > { > @@ -135,6 +115,19 @@ static void vkms_atomic_crtc_destroy_state(struct dr= m_crtc *crtc, > } > } > =20 > +static void vkms_atomic_crtc_reset(struct drm_crtc *crtc) > +{ > + struct vkms_crtc_state *vkms_state =3D > + kzalloc(sizeof(*vkms_state), GFP_KERNEL); > + > + if (crtc->state) > + vkms_atomic_crtc_destroy_state(crtc, crtc->state); > + > + __drm_atomic_helper_crtc_reset(crtc, &vkms_state->base); > + if (vkms_state) > + INIT_WORK(&vkms_state->crc_work, vkms_crc_work_handle); > +} > + > static const struct drm_crtc_funcs vkms_crtc_funcs =3D { > .set_config =3D drm_atomic_helper_set_config, > .destroy =3D drm_crtc_cleanup, > --=20 > 2.20.1 >=20 Hi Maarten, First of all, thanks for the patch :) I tested it on my VM with the IGT test, and everything looks fine. Reviewed-by: Rodrigo Siqueira --=20 Rodrigo Siqueira https://siqueira.tech Graduate Student Department of Computer Science University of S=E3o Paulo --huhwqr3x3oerr67f Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEE4tZ+ii1mjMCMQbfkWJzP/comvP8FAlyATQUACgkQWJzP/com vP8ASg//QD/0ZxueZwpSLY7lEpU447L5NDg7bhK6RmKbnqQbVR9Krdl+ineZhZge 6gX62ZeXrioR0tJpjwkK9nyn9J3BWYw6Te9dkcHCzJcbq9el7hTbgjbgJTVTmaeg rptOhqDiPJ7XIPgH5LRO4Q//Zr/ubBEUBAHBsM+nsggZojtcijpF3Lkee6geEc1g JITo11CwEkjlxKT1irCvwkXHDbR+Rca0zzhEAL7OWVCbTANsNDKyBVZWYlmWkZ8n dVOvGNKIGKmMzGnt3I5NWzM0ipQ9aDv04eSpMwhDOHQbqlauPOuZ2xoRqp85ndfw E0D75fuHtxvyu1Js6hax2GNqTxr5jUeQ3UPHhyKN6uOs0O+TYnpRMSJ9qN2AESG0 ezeIhM6Qv6JmeVC0Hug2Or8LYb+BCtxTY+Ny2YImMnSROMMH4nxeVw7+1EVt3J+x Rr0lOmzCP2X3mMjdZaqkhFBGMFbu0ZpmEbgdG7xVOQcNYJnpyoMJ0T4TrBJ71LVz o/6Sbr7A5UnBToCylLr1Pjp1gEXIjLg+JUVL6espfuyphwhPNG+RAZxoZ8Td/b7I YkRKFrIGL5AH/YnKXJSNnKWASzsC3Ul0KQM/0itBU2CzMOJcRqQDIE1v3V+evivB NaeFeSebkQ+y16rHh9L4OrX0/L4mTVaQLcl7PrpIzabWjw/jvCM= =NV2M -----END PGP SIGNATURE----- --huhwqr3x3oerr67f-- --===============0709104612== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4 IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4 --===============0709104612==--