From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH 1/5] drm/i915: trivial: kill-agp collateral cleanups Date: Tue, 29 Jan 2013 13:49:22 +0100 Message-ID: <20130129124922.GL14766@phenom.ffwll.local> References: <1359160867-780-1-git-send-email-ben@bwidawsk.net> <1359160867-780-2-git-send-email-ben@bwidawsk.net> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-we0-f175.google.com (mail-we0-f175.google.com [74.125.82.175]) by gabe.freedesktop.org (Postfix) with ESMTP id 34EFAE5C85 for ; Tue, 29 Jan 2013 04:47:14 -0800 (PST) Received: by mail-we0-f175.google.com with SMTP id x8so271989wey.6 for ; Tue, 29 Jan 2013 04:47:13 -0800 (PST) Content-Disposition: inline In-Reply-To: <1359160867-780-2-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@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Fri, Jan 25, 2013 at 04:41:03PM -0800, Ben Widawsky wrote: > - i915_gem_init_aliasing_ppgtt should now be static > - move i915_gem_init_ppgtt declaration to the right place > > Reviewed-by: Chris Wilson > Signed-off-by: Ben Widawsky I've tried to apply this patch on top of latest dinq, and there's nothing left after resolving conflicts. Have I screwed something up? -Daniel > --- > drivers/gpu/drm/i915/i915_drv.h | 3 +-- > drivers/gpu/drm/i915/i915_gem_gtt.c | 2 +- > 2 files changed, 2 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > index 09753e5..1af8e73 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -1598,7 +1598,6 @@ int __must_check i915_gem_init(struct drm_device *dev); > int __must_check i915_gem_init_hw(struct drm_device *dev); > void i915_gem_l3_remap(struct drm_device *dev); > void i915_gem_init_swizzling(struct drm_device *dev); > -void i915_gem_init_ppgtt(struct drm_device *dev); > void i915_gem_cleanup_ringbuffer(struct drm_device *dev); > int __must_check i915_gpu_idle(struct drm_device *dev); > int __must_check i915_gem_idle(struct drm_device *dev); > @@ -1653,7 +1652,7 @@ int i915_gem_context_destroy_ioctl(struct drm_device *dev, void *data, > struct drm_file *file); > > /* i915_gem_gtt.c */ > -int __must_check i915_gem_init_aliasing_ppgtt(struct drm_device *dev); > +void i915_gem_init_ppgtt(struct drm_device *dev); > void i915_gem_cleanup_aliasing_ppgtt(struct drm_device *dev); > void i915_ppgtt_bind_object(struct i915_hw_ppgtt *ppgtt, > struct drm_i915_gem_object *obj, > diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c > index a0ba4a9..462dec9 100644 > --- a/drivers/gpu/drm/i915/i915_gem_gtt.c > +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c > @@ -108,7 +108,7 @@ static void i915_ppgtt_clear_range(struct i915_hw_ppgtt *ppgtt, > } > } > > -int i915_gem_init_aliasing_ppgtt(struct drm_device *dev) > +static int i915_gem_init_aliasing_ppgtt(struct drm_device *dev) > { > struct drm_i915_private *dev_priv = dev->dev_private; > struct i915_hw_ppgtt *ppgtt; > -- > 1.8.1.1 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch