Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758178Ab3GZJQK (ORCPT ); Fri, 26 Jul 2013 05:16:10 -0400 Received: from mail-oa0-f51.google.com ([209.85.219.51]:47266 "EHLO mail-oa0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757029Ab3GZJQG (ORCPT ); Fri, 26 Jul 2013 05:16:06 -0400 MIME-Version: 1.0 X-Originating-IP: [178.83.130.250] In-Reply-To: References: <20130725192248.GA13295@cantiga.alporthouse.com> <20130725215259.GB13295@cantiga.alporthouse.com> <20130725232556.GF13295@cantiga.alporthouse.com> <20130726072646.GH13295@cantiga.alporthouse.com> <20130726085035.GJ13295@cantiga.alporthouse.com> Date: Fri, 26 Jul 2013 11:16:04 +0200 Message-ID: Subject: Re: [Intel-gfx] linux-next: Tree for Jul 25 [ call-trace: drm | drm-intel related? ] From: Daniel Vetter To: Sedat Dilek , David Herrmann Cc: Chris Wilson , Jani Nikula , Stephen Rothwell , intel-gfx , Linux Kernel Mailing List , DRI , linux-next Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2768 Lines: 62 On Fri, Jul 26, 2013 at 11:11 AM, Sedat Dilek wrote: > I have compared next-20130725 VS. next-20130726: > > $ head -2313 next-20130725-VS-next-20130726.diff | grep ^+ | grep i915 > + drm/i915: Colocate all GT access routines in the same file > + drm/i915: Use a private interface for register access within GT > + drm/i915: Use the common register access functions for NOTRACE variants > + drm/i915: Squash gen lookup through multiple indirections > inside GT access > + drm/i915: Convert the register access tracepoint to be conditional > + drm/i915: fix the racy object accounting > + drm/i915: dvo_ch7xxx: fix vsync polarity setting > + drm/i915: initialize gt_lock early with other spin locks > + Revert "ACPI / video / i915: No ACPI backlight if firmware > expects Windows 8" > + drivers/gpu/drm/i915/Makefile | 2 + > + drivers/gpu/drm/i915/dvo_ch7xxx.c | 2 +- > + drivers/gpu/drm/i915/i915_debugfs.c | 836 +-- > + drivers/gpu/drm/i915/i915_dma.c | 91 +- > + drivers/gpu/drm/i915/i915_drv.c | 292 +- > + drivers/gpu/drm/i915/i915_drv.h | 413 +- > + drivers/gpu/drm/i915/i915_gem.c | 411 +- > + drivers/gpu/drm/i915/i915_irq.c | 1347 ++--- > + drivers/gpu/drm/i915/i915_trace.h | 16 +- > + drivers/gpu/drm/i915/intel_display.c | 1065 ++-- > + drivers/gpu/drm/i915/intel_drv.h | 36 +- > + drivers/gpu/drm/i915/intel_pm.c | 431 +- > + drivers/gpu/drm/i915/intel_uncore.c | 595 +++ > > Any hints which of the commits could be culprit? None, it's the vma offset manager stuff in drm-next. diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c index 3613b50..1f76572 100644 --- a/drivers/gpu/drm/drm_gem.c +++ b/drivers/gpu/drm/drm_gem.c @@ -666,7 +666,7 @@ int drm_gem_mmap(struct file *filp, struct vm_area_struct *vma) } obj = container_of(node, struct drm_gem_object, vma_node); - ret = drm_gem_mmap_obj(obj, drm_vma_node_size(node), vma); + ret = drm_gem_mmap_obj(obj, drm_vma_node_size(node) << PAGE_SHIFT, vma); mutex_unlock(&dev->struct_mutex); That should fix stuff up again, David Herrmann is working on a real patch already. Cheers, Daniel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/