[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20130725184504.GC11514@cantiga.alporthouse.com>
Date: Thu, 25 Jul 2013 19:45:04 +0100
From: Chris Wilson <chris@...is-wilson.co.uk>
To: Sedat Dilek <sedat.dilek@...il.com>
Cc: Daniel Vetter <daniel.vetter@...ll.ch>,
Jani Nikula <jani.nikula@...ux.intel.com>,
Stephen Rothwell <sfr@...b.auug.org.au>,
intel-gfx <intel-gfx@...ts.freedesktop.org>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
DRI <dri-devel@...ts.freedesktop.org>,
linux-next <linux-next@...r.kernel.org>
Subject: Re: [Intel-gfx] linux-next: Tree for Jul 25 [ call-trace: drm |
drm-intel related? ]
On Thu, Jul 25, 2013 at 08:03:06PM +0200, Sedat Dilek wrote:
> On Thu, Jul 25, 2013 at 7:55 PM, Sedat Dilek <sedat.dilek@...il.com> wrote:
> > F*ck. Wrong patch refreshed.
> >
>
> New dmesg attached.
Hmm, not seeing any difference, so let's add a couple more lines just to
be sure:
(apologies I didn't stash the previous debug patch)
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 0563661..4d21f37 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -1624,30 +1624,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 = (u64)obj->base.map_list.hash.key << PAGE_SHIFT;
@@ -1655,6 +1664,7 @@ out:
drm_gem_object_unreference(&obj->base);
unlock:
mutex_unlock(&dev->struct_mutex);
+ DRM_DEBUG_DRIVER("done, ret=%d\n", ret);
return ret;
}
--
Chris Wilson, Intel Open Source Technology Centre
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists