From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: Re: [PATCH 1/3] drm/i915: s/i915_gem_do_init/i915_gem_init_global_gtt Date: Mon, 26 Mar 2012 09:48:01 +0100 Message-ID: <1332751691_97010@CP5-2952> References: <1332747942-2143-1-git-send-email-daniel.vetter@ffwll.ch> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from fireflyinternet.com (smtp.fireflyinternet.com [109.228.6.236]) by gabe.freedesktop.org (Postfix) with ESMTP id 399FE9EB5D for ; Mon, 26 Mar 2012 01:48:14 -0700 (PDT) In-Reply-To: <1332747942-2143-1-git-send-email-daniel.vetter@ffwll.ch> 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: Intel Graphics Development Cc: Daniel Vetter List-Id: intel-gfx@lists.freedesktop.org On Mon, 26 Mar 2012 09:45:40 +0200, Daniel Vetter wrote: > int > i915_gem_init_ioctl(struct drm_device *dev, void *data, > struct drm_file *file) > @@ -155,7 +136,8 @@ i915_gem_init_ioctl(struct drm_device *dev, void *data, > return -EINVAL; > > mutex_lock(&dev->struct_mutex); > - i915_gem_do_init(dev, args->gtt_start, args->gtt_end, args->gtt_end); > + i915_gem_init_global_gtt(dev, args->gtt_start, > + args->gtt_end, args->gtt_end); > mutex_unlock(&dev->struct_mutex); > > return 0; This raises the interesting question of ppgtt interacting with DRI1, a never supported combination. Do we start making that expressly clear with a few if (HAS_ALIASING_PPGTT()) return -ENODEV; or even if (gen >= 6) return -ENODEV; ? -Chris -- Chris Wilson, Intel Open Source Technology Centre