[Intel-gfx] [PATCH 1/3] drm/i915: s/i915_gem_do_init/i915_gem_init_global_gtt

[Chris Wilson]

On Mon, 26 Mar 2012 09:45:40 +0200, Daniel Vetter <daniel.vetter at ffwll.ch> 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