From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jesse Barnes Subject: Re: [PATCH 22/24] drm/i915: Allocate overlay registers from stolen memory Date: Thu, 11 Oct 2012 11:55:06 -0700 Message-ID: <20121011115506.5b33797c@jbarnes-desktop> References: <1346788996-19080-1-git-send-email-chris@chris-wilson.co.uk> <1346788996-19080-23-git-send-email-chris@chris-wilson.co.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from oproxy8-pub.bluehost.com (oproxy8-pub.bluehost.com [69.89.22.20]) by gabe.freedesktop.org (Postfix) with SMTP id 13E2AA0888 for ; Thu, 11 Oct 2012 11:54:26 -0700 (PDT) In-Reply-To: <1346788996-19080-23-git-send-email-chris@chris-wilson.co.uk> 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: Chris Wilson Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Tue, 4 Sep 2012 21:03:14 +0100 Chris Wilson wrote: > Signed-off-by: Chris Wilson > --- > drivers/gpu/drm/i915/intel_overlay.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_overlay.c b/drivers/gpu/drm/i915/intel_overlay.c > index afd0f30..2fa20a4 100644 > --- a/drivers/gpu/drm/i915/intel_overlay.c > +++ b/drivers/gpu/drm/i915/intel_overlay.c > @@ -1368,8 +1368,10 @@ void intel_setup_overlay(struct drm_device *dev) > > overlay->dev = dev; > > - reg_bo = i915_gem_alloc_object(dev, PAGE_SIZE); > - if (!reg_bo) > + reg_bo = i915_gem_object_create_stolen(dev, PAGE_SIZE); > + if (reg_bo == NULL) > + reg_bo = i915_gem_alloc_object(dev, PAGE_SIZE); > + if (reg_bo == NULL) > goto out_free; > overlay->reg_bo = reg_bo; > Reviewed-by: Jesse Barnes -- Jesse Barnes, Intel Open Source Technology Center