From patchwork Thu Jul 25 19:00:06 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 2833658 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 2DA2A9F4E2 for ; Thu, 25 Jul 2013 19:04:52 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CA55C20190 for ; Thu, 25 Jul 2013 19:04:50 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id B35022014A for ; Thu, 25 Jul 2013 19:04:49 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 48B28E5DEA for ; Thu, 25 Jul 2013 12:04:49 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from fireflyinternet.com (s16502780.onlinehome-server.info [87.106.93.118]) by gabe.freedesktop.org (Postfix) with ESMTP id B785EE71E9; Thu, 25 Jul 2013 12:00:16 -0700 (PDT) X-Default-Received-SPF: pass (skip=forwardok (res=PASS)) x-ip-name=78.156.73.22; Received: from cantiga.alporthouse.com (unverified [78.156.73.22]) by fireflyinternet.com (Firefly Internet (M2)) with ESMTP id 11254444-1500048 for multiple; Thu, 25 Jul 2013 20:00:37 +0100 Received: by cantiga.alporthouse.com (sSMTP sendmail emulation); Thu, 25 Jul 2013 20:00:06 +0100 Date: Thu, 25 Jul 2013 20:00:06 +0100 From: Chris Wilson To: Sedat Dilek Subject: Re: [Intel-gfx] linux-next: Tree for Jul 25 [ call-trace: drm | drm-intel related? ] Message-ID: <20130725190006.GD11514@cantiga.alporthouse.com> Mail-Followup-To: Chris Wilson , Sedat Dilek , Daniel Vetter , Jani Nikula , Stephen Rothwell , intel-gfx , Linux Kernel Mailing List , DRI , linux-next References: <20130725163150.GD6493@cantiga.alporthouse.com> <20130725170144.GE6493@cantiga.alporthouse.com> <20130725172616.GA11514@cantiga.alporthouse.com> <20130725184504.GC11514@cantiga.alporthouse.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) X-Originating-IP: 78.156.73.22 Cc: Stephen Rothwell , Daniel Vetter , intel-gfx , Linux Kernel Mailing List , DRI , linux-next X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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; }