From mboxrd@z Thu Jan 1 00:00:00 1970 From: Imre Deak Subject: Re: [RFC] drm/i915: Simplify page allocation loop a bit Date: Wed, 26 Mar 2014 18:58:44 +0200 Message-ID: <1395853124.14914.29.camel@intelbox> References: <1395852527-6048-1-git-send-email-tvrtko.ursulin@linux.intel.com> Reply-To: imre.deak@intel.com Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0191232529==" Return-path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id CD59F6E701 for ; Wed, 26 Mar 2014 09:58:59 -0700 (PDT) In-Reply-To: <1395852527-6048-1-git-send-email-tvrtko.ursulin@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: Tvrtko Ursulin Cc: Intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org --===============0191232529== Content-Type: multipart/signed; micalg="pgp-sha1"; protocol="application/pgp-signature"; boundary="=-WisgtGV7iLmGPmTPQNUm" --=-WisgtGV7iLmGPmTPQNUm Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Wed, 2014-03-26 at 16:48 +0000, Tvrtko Ursulin wrote: > From: Tvrtko Ursulin >=20 > Looks like there are some redundant lines in the main loop of > i915_gem_object_get_pages_gtt. >=20 > I haven't tested this so just RFC please. >=20 > Signed-off-by: Tvrtko Ursulin > Cc: Imre Deak Looks good to me. Fwiw: Reviewed-by: Imre Deak > --- > drivers/gpu/drm/i915/i915_gem.c | 16 +++------------- > 1 file changed, 3 insertions(+), 13 deletions(-) >=20 > diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_= gem.c > index 00c8361..5af3537 100644 > --- a/drivers/gpu/drm/i915/i915_gem.c > +++ b/drivers/gpu/drm/i915/i915_gem.c > @@ -1912,15 +1912,8 @@ i915_gem_object_get_pages_gtt(struct drm_i915_gem_= object *obj) > gfp |=3D __GFP_NORETRY | __GFP_NOWARN | __GFP_NO_KSWAPD; > gfp &=3D ~(__GFP_IO | __GFP_WAIT); > } > -#ifdef CONFIG_SWIOTLB > - if (swiotlb_nr_tbl()) { > - st->nents++; > - sg_set_page(sg, page, PAGE_SIZE, 0); > - sg =3D sg_next(sg); > - continue; > - } > -#endif > - if (!i || page_to_pfn(page) !=3D last_pfn + 1) { > + if (!i || page_to_pfn(page) !=3D last_pfn + 1 > + || swiotlb_nr_tbl()) { > if (i) > sg =3D sg_next(sg); > st->nents++; > @@ -1933,10 +1926,7 @@ i915_gem_object_get_pages_gtt(struct drm_i915_gem_= object *obj) > /* Check that the i965g/gm workaround works. */ > WARN_ON((gfp & __GFP_DMA32) && (last_pfn >=3D 0x00100000UL)); > } > -#ifdef CONFIG_SWIOTLB > - if (!swiotlb_nr_tbl()) > -#endif > - sg_mark_end(sg); > + sg_mark_end(sg); > obj->pages =3D st; > =20 > if (i915_gem_object_needs_bit17_swizzle(obj)) --=-WisgtGV7iLmGPmTPQNUm 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) iQEcBAABAgAGBQJTMwdEAAoJEORIIAnNuWDFLTMIAMMxBONsMSJmsCOZUjQmWKVT f0vdyTSI8vH6JiSszvbhB+2Hp0j/wDAhPxK3sNeW2Uwc6o6ny4N6EqIpYsqEEyve Nf56WR5QiO3ZP+e8ncjRwBoQLlkZmw2eLMVjEBbgrYLf7Dyu78VArU+xXOplEJiZ FKYPD5PHsDBvW8nuO2MzeapXH/lSBTCWziLZ9iSClV1uhOk9x99yVSPWpG9HdeSP 5fb55EfgMc9IQonbxO9HEFszFs7qfs9iKxbWY+9DL4PF7/UoTlEdALQbTV1+4W9+ ibrLu2Z+42LNgPGiLtLK3n4mzNFSKMhkJPefER6HAEHXLjLftKjGqVG460pTCPM= =5Xlw -----END PGP SIGNATURE----- --=-WisgtGV7iLmGPmTPQNUm-- --===============0191232529== 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 --===============0191232529==--