| Message ID | 1346788996-19080-23-git-send-email-chris@chris-wilson.co.uk (mailing list archive) |
|---|---|
| State | Deferred |
| Headers | show |
On Tue, 4 Sep 2012 21:03:14 +0100 Chris Wilson <chris@chris-wilson.co.uk> wrote: > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> > --- > 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 <jbarnes@virtuousgeek.org>
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;
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> --- drivers/gpu/drm/i915/intel_overlay.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)