From mboxrd@z Thu Jan 1 00:00:00 1970 From: Imre Deak Subject: Re: [PATCH V3 6/6] drm/i915: Use the coarse ping-pong mechanism based on drm fd to dispatch the BSD command on BDW GT3 Date: Wed, 16 Apr 2014 19:52:16 +0300 Message-ID: <1397667136.4215.51.camel@intelbox> References: <1397616077-1125-1-git-send-email-yakui.zhao@intel.com> <1397616077-1125-7-git-send-email-yakui.zhao@intel.com> Reply-To: imre.deak@intel.com Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2091151897==" Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 9186C6E3F4 for ; Wed, 16 Apr 2014 09:52:19 -0700 (PDT) In-Reply-To: <1397616077-1125-7-git-send-email-yakui.zhao@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Zhao Yakui Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org --===============2091151897== Content-Type: multipart/signed; micalg="pgp-sha1"; protocol="application/pgp-signature"; boundary="=-KbUnwfTB1r2M0s++l8mk" --=-KbUnwfTB1r2M0s++l8mk Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Wed, 2014-04-16 at 10:41 +0800, Zhao Yakui wrote: > The BDW GT3 has two independent BSD rings, which can be used to process t= he > video commands. To be simpler, it is transparent to user-space driver/mid= dle. > Instead the kernel driver will decide which ring is to dispatch the BSD v= ideo > command. >=20 > As every BSD ring is powerful, it is enough to dispatch the BSD video com= mand > based on the drm fd. In such case it can play back video stream while enc= oding > another video stream. The coarse ping-pong mechanism is used to determine > which BSD ring is used to dispatch the BSD video command. >=20 > V1->V2: Follow Daniel's comment and use the simple ping-pong mechanism. > This is only to add the support of dual BSD rings on BDW GT3 machine. > The further optimization will be considered in another patch set. >=20 > V2->V3: Follow Daniel's comment to use the struct_mutext instead of > atomic_t during determining which ring can be used to dispatch Video comm= and. >=20 > Signed-off-by: Zhao Yakui Reviewed-by: Imre Deak > --- > drivers/gpu/drm/i915/i915_dma.c | 3 +++ > drivers/gpu/drm/i915/i915_drv.h | 3 +++ > drivers/gpu/drm/i915/i915_gem_execbuffer.c | 40 ++++++++++++++++++++++= +++++- > 3 files changed, 45 insertions(+), 1 deletion(-) >=20 > diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_= dma.c > index 0b38f88..f7558f5 100644 > --- a/drivers/gpu/drm/i915/i915_dma.c > +++ b/drivers/gpu/drm/i915/i915_dma.c > @@ -1572,6 +1572,7 @@ int i915_driver_load(struct drm_device *dev, unsign= ed long flags) > spin_lock_init(&dev_priv->backlight_lock); > spin_lock_init(&dev_priv->uncore.lock); > spin_lock_init(&dev_priv->mm.object_stat_lock); > + dev_priv->ring_index =3D 0; > mutex_init(&dev_priv->dpio_lock); > mutex_init(&dev_priv->modeset_restore_lock); > =20 > @@ -1929,6 +1930,8 @@ void i915_driver_postclose(struct drm_device *dev, = struct drm_file *file) > { > struct drm_i915_file_private *file_priv =3D file->driver_priv; > =20 > + if (file_priv && file_priv->bsd_ring) > + file_priv->bsd_ring =3D NULL; > kfree(file_priv); > } > =20 > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_= drv.h > index 74aef6a..032f992 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -1472,6 +1472,8 @@ struct drm_i915_private { > struct i915_dri1_state dri1; > /* Old ums support infrastructure, same warning applies. */ > struct i915_ums_state ums; > + /* the indicator for dispatch video commands on two BSD rings */ > + int ring_index; > }; > =20 > static inline struct drm_i915_private *to_i915(const struct drm_device *= dev) > @@ -1679,6 +1681,7 @@ struct drm_i915_file_private { > =20 > struct i915_hw_context *private_default_ctx; > atomic_t rps_wait_boost; > + struct intel_ring_buffer *bsd_ring; > }; > =20 > /* > diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm= /i915/i915_gem_execbuffer.c > index 341ec68..1dc6f03 100644 > --- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c > +++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c > @@ -999,6 +999,37 @@ i915_reset_gen7_sol_offsets(struct drm_device *dev, > return 0; > } > =20 > +/** > + * Find one BSD ring to dispatch the corresponding BSD command. > + * The Ring ID is returned. > + */ > +static int gen8_dispatch_bsd_ring(struct drm_device *dev, > + struct drm_file *file) > +{ > + struct drm_i915_private *dev_priv =3D dev->dev_private; > + struct drm_i915_file_private *file_priv =3D file->driver_priv; > + > + /* Check whether the file_priv is using one ring */ > + if (file_priv->bsd_ring) > + return file_priv->bsd_ring->id; > + else { > + /* If no, use the ping-pong mechanism to select one ring */ > + int ring_id; > + > + mutex_lock(&dev->struct_mutex); > + if (dev_priv->ring_index =3D=3D 0) { > + ring_id =3D VCS; > + dev_priv->ring_index =3D 1; > + } else { > + ring_id =3D VCS2; > + dev_priv->ring_index =3D 0; > + } > + file_priv->bsd_ring =3D &dev_priv->ring[ring_id]; > + mutex_unlock(&dev->struct_mutex); > + return ring_id; > + } > +} > + > static int > i915_gem_do_execbuffer(struct drm_device *dev, void *data, > struct drm_file *file, > @@ -1043,7 +1074,14 @@ i915_gem_do_execbuffer(struct drm_device *dev, voi= d *data, > =20 > if ((args->flags & I915_EXEC_RING_MASK) =3D=3D I915_EXEC_DEFAULT) > ring =3D &dev_priv->ring[RCS]; > - else > + else if ((args->flags & I915_EXEC_RING_MASK) =3D=3D I915_EXEC_BSD) { > + if (HAS_BSD2(dev)) { > + int ring_id; > + ring_id =3D gen8_dispatch_bsd_ring(dev, file); > + ring =3D &dev_priv->ring[ring_id]; > + } else > + ring =3D &dev_priv->ring[VCS]; > + } else > ring =3D &dev_priv->ring[(args->flags & I915_EXEC_RING_MASK) - 1]; > =20 > if (!intel_ring_initialized(ring)) { --=-KbUnwfTB1r2M0s++l8mk 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 v1.4.14 (GNU/Linux) iQEcBAABAgAGBQJTTrVAAAoJEORIIAnNuWDFPgQH/Ajn00aQw1BBijTcfM64Dk22 PBE+zQVhekr5V8zdhblGDqWV0z08PtSckJyweH5nUCxbTQ/PLlQf3imcTAddulpG OBJBayb10kLNYfds6qkJm4vyjw3wjTRZdTOHsZ9OueJUbIvDgkvW/B1tkAEwdkzP O7bRRPGbyQigU8EeoBsPuKvsI03/NCr/0+opWw5HvYYPR8DQ2cLCNMMgGr53x+F1 LwDIP01Mdb1XyMafEnIGuXvzAZlX0rCxI+NTvQkevxQOkH6TqiFcQhzJ4OEIxhyJ VIgfWUODgFKe8I6AGNKxbkxUfCubuapWm+hg+ANLUMQQv10qT904MMJj4DWGbbU= =DJkA -----END PGP SIGNATURE----- --=-KbUnwfTB1r2M0s++l8mk-- --===============2091151897== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx --===============2091151897==--