1. 13 Jun, 2012 12 commits
  2. 12 Jun, 2012 11 commits
    • Linus Torvalds's avatar
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · 94fa83c4
      Linus Torvalds authored
      Pull drm fixes from Dave Airlie:
       "As per your -rc2 announce, this is small and urgent only,
      
        The radeon one is for a regression in 3.4 so we need this one in your
        tree so we can send the stable one out, code in 3.4 broke some old
        userspaces.  The max props increase fixes spew being seen on a few
        machines.  And a ttm regression to fix some accounting issues that
        affect vmwgfx."
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
        drm/ttm: Fix buffer object metadata accounting regression v2
        drm: increase DRM_OBJECT_MAX_PROPERTY to 24
        drm/radeon: fix tiling and command stream checking on evergreen v3
      94fa83c4
    • Linus Torvalds's avatar
      Merge tag 'writeback-lock-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux · 266ae4e6
      Linus Torvalds authored
      Pull writeback locking fix from Wu Fengguang:
       "fix unbalanced wb->list_lock in 3.5-rc1"
      
      * tag 'writeback-lock-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux:
        writeback: Fix lock imbalance in writeback_sb_inodes()
      266ae4e6
    • Thomas Hellstrom's avatar
      drm/ttm: Fix buffer object metadata accounting regression v2 · a393c730
      Thomas Hellstrom authored
      A regression was introduced in the 3.3 rc series, commit
      "drm/ttm: simplify memory accounting for ttm user v2",
      causing the metadata of buffer objects created using the ttm_bo_create()
      function to be accounted twice.
      That causes massive leaks with the vmwgfx driver running for example
      SpecViewperf Catia-03 test 2, eventually killing the app.
      
      Furthermore, the same commit introduces a regression where
      metadata accounting is leaked if a buffer object is
      initialized with an illegal size. This is also fixed with this commit.
      
      v2: Fixed an error path and removed an unused variable.
      Signed-off-by: default avatarThomas Hellstrom <thellstrom@vmware.com>
      Reviewed-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
      Cc: Jerome Glisse <jglisse@redhat.com>
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      a393c730
    • Paulo Zanoni's avatar
      drm: increase DRM_OBJECT_MAX_PROPERTY to 24 · fe456168
      Paulo Zanoni authored
      Before Kernel 3.5, no one was checking for the return value of
      drm_connector_attach_property, so we never noticed that we were unable
      to create some properties. Commit "drm: WARN() when
      drm_connector_attach_property fails" added a WARN when we fail to
      create a property, and the transition from "connector properties" to
      "object properties" changed the warning message a little bit.
      
      On i915 machines with many TV connectors we hit the maximum number of
      properties (since each TV connector uses a lot of properties), so we
      get a few backtraces in our logs. This commit increases the maximum
      number of properties to 24 hoping we'll have enough room for
      everybody.
      
      Chris suggested that we convert this code to "lists", but I believe
      this conversion can come after we make sure people's dmesgs are not
      spammed by our driver.
      Signed-off-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
      Reported-by: default avatarDave Jones <davej@redhat.com>
      Tested-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      fe456168
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu · 7452ca51
      Linus Torvalds authored
      Pull m68knommu from Greg Ungerer:
       "This contains five fixes.  Four fix build problems introduced by
        recent clean up and merging of the m68k timer and ptrace code.  The
        other fixes the 528x ColdFire CPU QSPI base address definition, missed
        in the ColdFire QSPI cleanup."
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
        m68k: make syscall_trace_enter/leave exist for non-MMU classic m68k types
        m68knommu: fix 68360 local setting of timer interrupt handler
        m68knommu: fix 68328 local setting of timer interrupt handler
        m68k: fix inclusion of arch_gettimeoffset for non-MMU 68k classic CPU types
        m68knommu: m528x qspi definition fix
      7452ca51
    • Randy Dunlap's avatar
      exofs: fix sparse non-ANSI function warning · b8429719
      Randy Dunlap authored
      Fix sparse non-ANSI function warning:
      
        fs/exofs/sys.c:112:28: warning: non-ANSI function declaration of function 'exofs_sysfs_dbg_print'
      Signed-off-by: default avatarRandy Dunlap <rdunlap@xenotime.net>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      b8429719
    • Greg Ungerer's avatar
      m68k: make syscall_trace_enter/leave exist for non-MMU classic m68k types · 70c778f7
      Greg Ungerer authored
      The assembler entry code calls directly to the syscall_trace_enter() and
      syscall_trace_leave() functions. But currently they are conditionaly
      compiled out for the non-MMU classic m68k CPU types (so 68328 for example),
      resulting in a link error:
      
            LD      vmlinux
          arch/m68k/platform/68328/built-in.o: In function `do_trace':
          (.text+0x1c): undefined reference to `syscall_trace_enter'
          arch/m68k/platform/68328/built-in.o: In function `do_trace':
          (.text+0x4c): undefined reference to `syscall_trace_leave'
      
      Change the conditional check that includes these functions to be true for
      the !defined(CONFIG_MMU) case as well.
      Signed-off-by: default avatarGreg Ungerer <gerg@uclinux.org>
      Acked-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
      70c778f7
    • Greg Ungerer's avatar
      m68knommu: fix 68360 local setting of timer interrupt handler · 1b461d76
      Greg Ungerer authored
      Compiling for 68360 based targets fails with:
      
          arch/m68k/platform/68360/config.c: In function ‘hw_tick’:
          arch/m68k/platform/68360/config.c:55:2: error: implicit declaration of function ‘arch_timer_interrupt’
          arch/m68k/platform/68360/config.c: At top level:
          arch/m68k/platform/68360/config.c:64:6: error: conflicting types for ‘hw_timer_init’
          arch/m68k/include/asm/machdep.h:36:13: note: previous declaration of ‘hw_timer_init’ was here
      
      Changes made to hw_timer_init() didn't get updated in the 68328 timer code.
      So process and call the "handler" arg that is now passed into that
      hw_timer_init() function.
      Signed-off-by: default avatarGreg Ungerer <gerg@uclinux.org>
      1b461d76
    • Greg Ungerer's avatar
      m68knommu: fix 68328 local setting of timer interrupt handler · dc5588ae
      Greg Ungerer authored
      Compiling for 68328 based targets fails with:
      
          arch/m68k/platform/68328/timers.c: In function ‘hw_tick’:
          arch/m68k/platform/68328/timers.c:65:2: error: implicit declaration of function ‘arch_timer_interrupt’
          arch/m68k/platform/68328/timers.c: At top level:
          arch/m68k/platform/68328/timers.c:102:6: error: conflicting types for ‘hw_timer_init’
          arch/m68k/include/asm/machdep.h:36:13: note: previous declaration of ‘hw_timer_init’ was here
      
      Changes made to hw_timer_init() didn't get updated in the 68328 timer code.
      So process and call the "handler" arg that is now passed into that
      hw_timer_init() function.
      Signed-off-by: default avatarGreg Ungerer <gerg@uclinux.org>
      dc5588ae
    • Greg Ungerer's avatar
      m68k: fix inclusion of arch_gettimeoffset for non-MMU 68k classic CPU types · b13b3f51
      Greg Ungerer authored
      When building for non-MMU based classic 68k CPU types (like the 68328 for
      example) you get a compilation error:
      
        CC      arch/m68k/kernel/time.o
      arch/m68k/kernel/time.c:91:5: error: redefinition of ‘arch_gettimeoffset’
      include/linux/time.h:145:19: note: previous definition of ‘arch_gettimeoffset’ was here
      
      The arch_gettimeoffset() code is included when building for these CPU types,
      but it shouldn't be. Those machine types do not have
      CONFIG_ARCH_USES_GETTIMEOFFSET set.
      
      The fix is simply to conditionally include the arch_gettimeoffset() code on
      that same config setting that specifies its use or not.
      Signed-off-by: default avatarGreg Ungerer <gerg@uclinux.org>
      Acked-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
      b13b3f51
    • Steven King's avatar
      m68knommu: m528x qspi definition fix · f75b0d07
      Steven King authored
      The consolidation of the qspi code missed a definition for 528x.
      Signed-off-by: default avatarSteven King <sfking@fdwdc.com>
      Signed-off-by: default avatarGreg Ungerer <gerg@uclinux.org>
      f75b0d07
  3. 11 Jun, 2012 8 commits
  4. 10 Jun, 2012 1 commit
    • Jerome Glisse's avatar
      drm/radeon: fix tiling and command stream checking on evergreen v3 · d2609875
      Jerome Glisse authored
      Fix regresson since the introduction of command stream checking on
      evergreen (thread referenced below). Issue is cause by ddx allocating
      bo with formula width*height*bpp while programming the GPU command
      stream with ALIGN(height, 8). In some case (where page alignment does
      not hide the extra size bo should be according to height alignment)
      the kernel will reject the command stream.
      
      This patch reprogram the command stream to slice - 1 (slice is
      a derivative value from height) which avoid rejecting the command
      stream while keeping the value of command stream checking from a
      security point of view.
      
      This patch also fix wrong computation of layer size for 2D tiled
      surface. Which should fix issue when 2D color tiling is enabled.
      This dump the radeon KMS_DRIVER_MINOR so userspace can know if
      they are on a fixed kernel or not.
      
      https://lkml.org/lkml/2012/6/3/80
      https://bugs.freedesktop.org/show_bug.cgi?id=50892
      https://bugs.freedesktop.org/show_bug.cgi?id=50857
      
      !!! STABLE need a custom version of this patch for 3.4 !!!
      
      v2: actually bump the minor version and add comment about stable
      v3: do compute the height the ddx was trying to use
      
      [airlied: drop left over debug]
      Signed-off-by: default avatarJerome Glisse <jglisse@redhat.com>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      d2609875
  5. 09 Jun, 2012 1 commit
  6. 08 Jun, 2012 7 commits