From mboxrd@z Thu Jan 1 00:00:00 1970 From: Imre Deak Subject: Re: [PATCH 05/11] drm/i915: Create VMAs Date: Thu, 11 Jul 2013 14:20:50 +0300 Message-ID: <1373541650.12949.8.camel@intelbox> References: <1373350122-5118-1-git-send-email-ben@bwidawsk.net> <1373350122-5118-6-git-send-email-ben@bwidawsk.net> Reply-To: imre.deak@intel.com Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0937622688==" Return-path: Received: from mga14.intel.com (mga14.intel.com [143.182.124.37]) by gabe.freedesktop.org (Postfix) with ESMTP id 19789E5DBE for ; Thu, 11 Jul 2013 04:21:02 -0700 (PDT) In-Reply-To: <1373350122-5118-6-git-send-email-ben@bwidawsk.net> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: Ben Widawsky Cc: Intel GFX List-Id: intel-gfx@lists.freedesktop.org --===============0937622688== Content-Type: multipart/signed; micalg="pgp-sha1"; protocol="application/pgp-signature"; boundary="=-hOIW13CmITy387Iwzpfs" --=-hOIW13CmITy387Iwzpfs Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Mon, 2013-07-08 at 23:08 -0700, Ben Widawsky wrote: > Formerly: "drm/i915: Create VMAs (part 1)" >=20 > In a previous patch, the notion of a VM was introduced. A VMA describes > an area of part of the VM address space. A VMA is similar to the concept > in the linux mm. However, instead of representing regular memory, a VMA > is backed by a GEM BO. There may be many VMAs for a given object, one > for each VM the object is to be used in. This may occur through flink, > dma-buf, or a number of other transient states. >=20 > Currently the code depends on only 1 VMA per object, for the global GTT > (and aliasing PPGTT). The following patches will address this and make > the rest of the infrastructure more suited >=20 > v2: s/i915_obj/i915_gem_obj (Chris) >=20 > v3: Only move an object to the now global unbound list if there are no > more VMAs for the object which are bound into a VM (ie. the list is > empty). >=20 > v4: killed obj->gtt_space > some reworks due to rebase >=20 > Signed-off-by: Ben Widawsky > --- > drivers/gpu/drm/i915/i915_drv.h | 48 ++++++++++++++++++++++------ > drivers/gpu/drm/i915/i915_gem.c | 57 ++++++++++++++++++++++++++++= +----- > drivers/gpu/drm/i915/i915_gem_evict.c | 12 ++++--- > drivers/gpu/drm/i915/i915_gem_gtt.c | 5 +-- > drivers/gpu/drm/i915/i915_gem_stolen.c | 14 ++++++--- > 5 files changed, 110 insertions(+), 26 deletions(-) >=20 > [...] > diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_= gem.c > index 525aa8f..058ad44 100644 > --- a/drivers/gpu/drm/i915/i915_gem.c > +++ b/drivers/gpu/drm/i915/i915_gem.c > @@ -2578,6 +2578,7 @@ int > i915_gem_object_unbind(struct drm_i915_gem_object *obj) > { > drm_i915_private_t *dev_priv =3D obj->base.dev->dev_private; > + struct i915_vma *vma; > int ret; > =20 > if (!i915_gem_obj_ggtt_bound(obj)) > @@ -2615,11 +2616,20 @@ i915_gem_object_unbind(struct drm_i915_gem_object= *obj) > i915_gem_object_unpin_pages(obj); > =20 > list_del(&obj->mm_list); > - list_move_tail(&obj->global_list, &dev_priv->mm.unbound_list); > /* Avoid an unnecessary call to unbind on rebind. */ > obj->map_and_fenceable =3D true; > =20 > - drm_mm_remove_node(&obj->gtt_space); > + vma =3D __i915_gem_obj_to_vma(obj); > + list_del(&vma->vma_link); > + drm_mm_remove_node(&vma->node); > + i915_gem_vma_destroy(vma); > + > + /* Since the unbound list is global, only move to that list if > + * no more VMAs exist. > + * NB: Until we have real VMAs there will only ever be one */ > + WARN_ON(!list_empty(&obj->vma_list)); > + if (list_empty(&obj->vma_list)) > + list_move_tail(&obj->global_list, &dev_priv->mm.unbound_list); > =20 > return 0; > } > @@ -3070,8 +3080,12 @@ i915_gem_object_bind_to_gtt(struct drm_i915_gem_ob= ject *obj, > bool mappable, fenceable; > size_t gtt_max =3D map_and_fenceable ? > dev_priv->gtt.mappable_end : dev_priv->gtt.base.total; > + struct i915_vma *vma; > int ret; > =20 > + if (WARN_ON(!list_empty(&obj->vma_list))) > + return -EBUSY; > + > fence_size =3D i915_gem_get_gtt_size(dev, > obj->base.size, > obj->tiling_mode); > @@ -3110,9 +3124,15 @@ i915_gem_object_bind_to_gtt(struct drm_i915_gem_ob= ject *obj, > =20 > i915_gem_object_pin_pages(obj); > =20 > + vma =3D i915_gem_vma_create(obj, &dev_priv->gtt.base); > + if (vma =3D=3D NULL) { > + i915_gem_object_unpin_pages(obj); > + return -ENOMEM; > + } > + > search_free: > ret =3D drm_mm_insert_node_in_range_generic(&dev_priv->gtt.base.mm, > - &obj->gtt_space, > + &vma->node, > size, alignment, > obj->cache_level, 0, gtt_max); > if (ret) { > @@ -3126,22 +3146,23 @@ search_free: > i915_gem_object_unpin_pages(obj); > return ret; > } > - if (WARN_ON(!i915_gem_valid_gtt_space(dev, &obj->gtt_space, > + if (WARN_ON(!i915_gem_valid_gtt_space(dev, &vma->node, > obj->cache_level))) { > i915_gem_object_unpin_pages(obj); > - drm_mm_remove_node(&obj->gtt_space); > + drm_mm_remove_node(&vma->node); > return -EINVAL; > } > =20 > ret =3D i915_gem_gtt_prepare_object(obj); > if (ret) { > i915_gem_object_unpin_pages(obj); > - drm_mm_remove_node(&obj->gtt_space); > + drm_mm_remove_node(&vma->node); > return ret; > } Freeing vma on the error path is missing. With this and the issue in 1/5 addressed things look good to me, so on 1-5: Reviewed-by: Imre Deak --Imre --=-hOIW13CmITy387Iwzpfs 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.12 (GNU/Linux) iQEcBAABAgAGBQJR3pUSAAoJEORIIAnNuWDFHRgH/14BUAfXCFBdQ1aKG9NN+C8H 7aUfvxvAHEv2Nyw2BKuJpcgYRFTbnlYzMGrHBVYkOoGfpt0IMs/CogXatMB2m7PM 4SV+/f5nHNr7E7wqhZry3Odq0mwDle9QkfL37SyMUAVGz7uUFtjo9wc9LpZJRjCH aoGFVijK4aeo5v04A3KlMvKOODlTU4ZL9uqAcQQa2aWcdizSAHsRFAAbDRZnUxaQ 2K51l3SULXWCRBtvWNB7hxGPX1W41usH3aUB/YeULBLgoKij73h/6nG8KpNjyiex XYsqzt2KoTj86tg/6E/CAUey+1mM/kfJNbR/Ul9u5G/Tp503jU6/OoN0MM8M0Xw= =pUhC -----END PGP SIGNATURE----- --=-hOIW13CmITy387Iwzpfs-- --===============0937622688== 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 --===============0937622688==--