On Thu, Jul 25, 2013 at 9:00 PM, Chris Wilson <chris@chris-wilson.co.uk> wrote:
> On Thu, Jul 25, 2013 at 08:50:59PM +0200, Sedat Dilek wrote:
>> Against what tree is this applicable? It is definitely not drm-intel-nightly.
>
> Applied cleanly to nightly here, but just in case here's a rebased version:
>
> diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
> index 3a5d4ba..5818fe8 100644
> --- a/drivers/gpu/drm/i915/i915_gem.c
> +++ b/drivers/gpu/drm/i915/i915_gem.c
> @@ -1527,30 +1527,39 @@ i915_gem_mmap_gtt(struct drm_file *file,
>         struct drm_i915_gem_object *obj;
>         int ret;
>
> +       printk(KERN_ERR "Hello!\n");
> +
>         ret = i915_mutex_lock_interruptible(dev);
> -       if (ret)
> +       if (ret) {
> +               DRM_DEBUG_DRIVER("interrupted: ret=%d\n", ret);
>                 return ret;
> +       }
>
>         obj = to_intel_bo(drm_gem_object_lookup(dev, file, handle));
>         if (&obj->base == NULL) {
> +               DRM_DEBUG_DRIVER("Unknown object handle %d\n", handle);
>                 ret = -ENOENT;
>                 goto unlock;
>         }
>
>         if (obj->base.size > dev_priv->gtt.mappable_end) {
> +               DRM_DEBUG_DRIVER("Object (%d) larger than mappable aperture (%d) > %d\n",
> +                               (int)obj->base.size, (int)dev_priv->gtt.mappable_end);
>                 ret = -E2BIG;
>                 goto out;
>         }
>
>         if (obj->madv != I915_MADV_WILLNEED) {
> -               DRM_ERROR("Attempting to mmap a purgeable buffer\n");
> +               DRM_DEBUG_DRIVER("Attempting to mmap a purgeable buffer\n");
>                 ret = -EINVAL;
>                 goto out;
>         }
>
>         ret = i915_gem_object_create_mmap_offset(obj);
> -       if (ret)
> +       if (ret) {
> +               DRM_DEBUG_DRIVER("Failed to allocate mmap offset (ret=%d)\n", ret);
>                 goto out;
> +       }
>
>         *offset = drm_vma_node_offset_addr(&obj->base.vma_node);
>
> @@ -1558,6 +1567,7 @@ out:
>         drm_gem_object_unreference(&obj->base);
>  unlock:
>         mutex_unlock(&dev->struct_mutex);
> +       DRM_DEBUG_DRIVER("done, ret=%d\n", ret);
>         return ret;
>  }
>
> --

This one applies cleanly.

New -3 dmesg.

- S.

> Chris Wilson, Intel Open Source Technology Centre
> --
> To unsubscribe from this list: send the line "unsubscribe linux-next" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html