From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Souza, Jose" Subject: Re: [PATCH 1/4] drm/i915: Move drm_vblank_init() to i915_load_modeset_init() Date: Fri, 9 Nov 2018 01:53:41 +0000 Message-ID: <080ae0de6345c36223ceb5d85c788e58e4c85f9a.camel@intel.com> References: <20181108001647.11276-1-jose.souza@intel.com> <20181108153305.GY9144@intel.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1421227379==" Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id E89CE6E71B for ; Fri, 9 Nov 2018 01:53:43 +0000 (UTC) In-Reply-To: <20181108153305.GY9144@intel.com> Content-Language: en-US List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: "intel-gfx@lists.freedesktop.org" Cc: "Nikula, Jani" List-Id: intel-gfx@lists.freedesktop.org --===============1421227379== Content-Language: en-US Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="=-kQAfO56919MlPxtSoghV" --=-kQAfO56919MlPxtSoghV Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Thu, 2018-11-08 at 17:33 +0200, Ville Syrj=C3=A4l=C3=A4 wrote: > On Wed, Nov 07, 2018 at 04:16:44PM -0800, Jos=C3=A9 Roberto de Souza > wrote: > > i915_load_modeset_init() is a more suitable place than > > i915_driver_load() as vblank is part of modeset. > >=20 > > Cc: Jani Nikula > > Cc: Ville Syrj=C3=A4l=C3=A4 > > Signed-off-by: Jos=C3=A9 Roberto de Souza >=20 > Reviewed-by: Ville Syrj=C3=A4l=C3=A4 Thanks for the reviews, patches pushed to drm-intel-next-queued >=20 > > --- > > drivers/gpu/drm/i915/i915_drv.c | 19 +++++++------------ > > 1 file changed, 7 insertions(+), 12 deletions(-) > >=20 > > diff --git a/drivers/gpu/drm/i915/i915_drv.c > > b/drivers/gpu/drm/i915/i915_drv.c > > index acb516308262..b9108a5821a5 100644 > > --- a/drivers/gpu/drm/i915/i915_drv.c > > +++ b/drivers/gpu/drm/i915/i915_drv.c > > @@ -645,6 +645,13 @@ static int i915_load_modeset_init(struct > > drm_device *dev) > > if (i915_inject_load_failure()) > > return -ENODEV; > > =20 > > + if (INTEL_INFO(dev_priv)->num_pipes) { > > + ret =3D drm_vblank_init(&dev_priv->drm, > > + INTEL_INFO(dev_priv)->num_pipes); > > + if (ret) > > + goto out; > > + } > > + > > intel_bios_init(dev_priv); > > =20 > > /* If we have > 1 VGA cards, then we need to arbitrate access > > @@ -1712,18 +1719,6 @@ int i915_driver_load(struct pci_dev *pdev, > > const struct pci_device_id *ent) > > if (ret < 0) > > goto out_cleanup_mmio; > > =20 > > - /* > > - * TODO: move the vblank init and parts of modeset init steps > > into one > > - * of the i915_driver_init_/i915_driver_register functions > > according > > - * to the role/effect of the given init step. > > - */ > > - if (INTEL_INFO(dev_priv)->num_pipes) { > > - ret =3D drm_vblank_init(&dev_priv->drm, > > - INTEL_INFO(dev_priv)->num_pipes); > > - if (ret) > > - goto out_cleanup_hw; > > - } > > - > > ret =3D i915_load_modeset_init(&dev_priv->drm); > > if (ret < 0) > > goto out_cleanup_hw; > > --=20 > > 2.19.1 --=-kQAfO56919MlPxtSoghV Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iQEzBAABCAAdFiEEVNG051EijGa0MiaQVenbO/mOWkkFAlvk6KMACgkQVenbO/mO WkkvOggApORb9F9bXnjaw9Lq+DhqB1beIxAHDdaQT+ehdOnfRCslk0/SmRCG/rQg Dc1wrI/AhMrHU3fFJ/PXauZyJd6nVcNZXpCaPsCU2rxzNK0xX+VcJSeYo3dXd8lq I2cafrGIl5zYzdreEJNGi19KChwLTsEVHgxRD+OI/K/jU+z7oHGmII3akeg1hQ8v 7UEMrKI26OQP0ISzNLLXq0K4PbrJmt+F8LHtPytJKtILr72WS/Om9jHmqWPOuL/C qUv3Iz2YxuAFGRf+hbu/GSpFeS9xEVn42dMmV09SGUvRGf9FkGQ8HrELRTnH9StB /iQ4DKNJmw3BhJsbFNiM6wiF8hjpfw== =uiFM -----END PGP SIGNATURE----- --=-kQAfO56919MlPxtSoghV-- --===============1421227379== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: inline X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KSW50ZWwtZ2Z4 IG1haWxpbmcgbGlzdApJbnRlbC1nZnhAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlz dHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwtZ2Z4Cg== --===============1421227379==--