From: Chris Wilson <chris@chris-wilson•co.uk>
To: Sedat Dilek <sedat.dilek@gmail•com>
Cc: Daniel Vetter <daniel.vetter@ffwll•ch>,
Jani Nikula <jani.nikula@linux•intel.com>,
Stephen Rothwell <sfr@canb•auug.org.au>,
intel-gfx <intel-gfx@lists•freedesktop.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
DRI <dri-devel@lists•freedesktop.org>,
linux-next <linux-next@vger•kernel.org>
Subject: Re: [Intel-gfx] linux-next: Tree for Jul 25 [ call-trace: drm | drm-intel related? ]
Date: Thu, 25 Jul 2013 20:00:06 +0100 [thread overview]
Message-ID: <20130725190006.GD11514@cantiga.alporthouse.com> (raw)
In-Reply-To: <CA+icZUVLXxA5LPxzTjyhP5gryNUH3OY+vutoXQj6ydtCU0msbA@mail.gmail.com>
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;
}
--
Chris Wilson, Intel Open Source Technology Centre
next prev parent reply other threads:[~2013-07-25 19:00 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-25 8:54 linux-next: Tree for Jul 25 [ call-trace: drm | drm-intel related? ] Sedat Dilek
2013-07-25 9:44 ` [Intel-gfx] " Jani Nikula
2013-07-25 10:02 ` Sedat Dilek
2013-07-25 10:05 ` Sedat Dilek
2013-07-25 10:21 ` Jani Nikula
2013-07-25 10:37 ` Sedat Dilek
2013-07-25 13:36 ` [Intel-gfx] " Daniel Vetter
2013-07-25 14:23 ` Sedat Dilek
2013-07-25 14:27 ` Daniel Vetter
2013-07-25 15:03 ` Sedat Dilek
2013-07-25 15:05 ` Daniel Vetter
2013-07-25 15:34 ` Sedat Dilek
2013-07-25 16:11 ` Sedat Dilek
2013-07-25 16:31 ` Chris Wilson
2013-07-25 16:35 ` Sedat Dilek
2013-07-25 17:01 ` [Intel-gfx] " Chris Wilson
2013-07-25 17:15 ` Sedat Dilek
2013-07-25 17:26 ` [Intel-gfx] " Chris Wilson
2013-07-25 17:52 ` Sedat Dilek
2013-07-25 17:55 ` Sedat Dilek
2013-07-25 18:03 ` Sedat Dilek
2013-07-25 18:45 ` [Intel-gfx] " Chris Wilson
2013-07-25 18:50 ` Sedat Dilek
2013-07-25 19:00 ` Chris Wilson [this message]
2013-07-25 19:12 ` Sedat Dilek
2013-07-25 19:22 ` Chris Wilson
2013-07-25 19:32 ` Sedat Dilek
2013-07-25 20:07 ` Sedat Dilek
2013-07-25 21:52 ` Chris Wilson
2013-07-25 23:21 ` Sedat Dilek
2013-07-25 23:25 ` Chris Wilson
2013-07-26 7:15 ` Sedat Dilek
2013-07-26 7:26 ` Chris Wilson
2013-07-26 8:25 ` Sedat Dilek
2013-07-26 8:27 ` [Intel-gfx] " Sedat Dilek
2013-07-26 8:50 ` Chris Wilson
2013-07-26 8:52 ` Daniel Vetter
2013-07-26 9:02 ` Sedat Dilek
2013-07-26 9:11 ` Sedat Dilek
2013-07-26 9:16 ` Daniel Vetter
2013-07-26 9:32 ` Sedat Dilek
2013-07-26 10:34 ` Sedat Dilek
2013-07-25 18:03 ` Chris Wilson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130725190006.GD11514@cantiga.alporthouse.com \
--to=chris@chris-wilson$(echo .)co.uk \
--cc=daniel.vetter@ffwll$(echo .)ch \
--cc=dri-devel@lists$(echo .)freedesktop.org \
--cc=intel-gfx@lists$(echo .)freedesktop.org \
--cc=jani.nikula@linux$(echo .)intel.com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sedat.dilek@gmail$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox