From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH] drm/i915: allow stolen, pre-allocated objects to avoid GTT allocation Date: Wed, 8 May 2013 19:59:51 +0300 Message-ID: <20130508165951.GM14974@intel.com> References: <1368030989-4817-1-git-send-email-jbarnes@virtuousgeek.org> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTP id 13F79E63BA for ; Wed, 8 May 2013 09:59:57 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1368030989-4817-1-git-send-email-jbarnes@virtuousgeek.org> 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: Jesse Barnes Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Wed, May 08, 2013 at 09:36:29AM -0700, Jesse Barnes wrote: > In some cases, we may not need GTT address space allocated to a stolen > object, so allow passing -1 to the preallocated function to indicate as > much. > = > Signed-off-by: Jesse Barnes > --- > drivers/gpu/drm/i915/i915_gem_stolen.c | 4 ++++ > drivers/gpu/drm/i915/intel_pm.c | 2 +- > 2 files changed, 5 insertions(+), 1 deletion(-) > = > diff --git a/drivers/gpu/drm/i915/i915_gem_stolen.c b/drivers/gpu/drm/i91= 5/i915_gem_stolen.c > index 9137fa4c..2e92861 100644 > --- a/drivers/gpu/drm/i915/i915_gem_stolen.c > +++ b/drivers/gpu/drm/i915/i915_gem_stolen.c > @@ -360,6 +360,10 @@ i915_gem_object_create_stolen_for_preallocated(struc= t drm_device *dev, > return NULL; > } > = > + /* Some objects just need physical mem from stolen space */ > + if (gtt_offset =3D=3D -1) > + return obj; Surely that will explode in the BUG_ON(gtt_offset & 4095), or did that get removed? > + > /* To simplify the initialisation sequence between KMS and GTT, > * we allow construction of the stolen object prior to > * setting up the GTT space. The actual reservation will occur > diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel= _pm.c > index e60cd3e..081194d 100644 > --- a/drivers/gpu/drm/i915/intel_pm.c > +++ b/drivers/gpu/drm/i915/intel_pm.c > @@ -2877,7 +2877,7 @@ static void valleyview_setup_pctx(struct drm_device= *dev) > pcbr_offset =3D (pcbr & (~4095)) - dev_priv->mm.stolen_base; > pctx =3D i915_gem_object_create_stolen_for_preallocated(dev_priv->dev, > pcbr_offset, > - pcbr_offset, > + -1, > pctx_size); > goto out; > } > -- = > 1.7.10.4 > = > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- = Ville Syrj=E4l=E4 Intel OTC