1. 12 Oct, 2013 3 commits
  2. 11 Oct, 2013 8 commits
    • Linus Torvalds's avatar
      Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus · 46f37519
      Linus Torvalds authored
      Pull MIPS fix from Ralf Baechle:
       "Just one fix.  The stack protector was loading the value of the canary
        instead of its address"
      
      * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
        MIPS: stack protector: Fix per-task canary switch
      46f37519
    • Linus Torvalds's avatar
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · cd4edf7a
      Linus Torvalds authored
      Pull drm fixes from Dave Airlie:
       "All over the map..
      
         - nouveau:
           disable MSI, needs more work, will try again next merge window
         - radeon:
            audio + uvd regression fixes, dpm fixes, reset fixes
         - i915:
           the dpms fix might fix your haswell
      
        And one pain in the ass revert, so we have VGA arbitration that when
        implemented 4-5 years ago really hoped that GPUs could remove
        themselves from arbitration completely once they had a kernel driver.
      
        It seems Intel hw designers decided that was too nice a facility to
        allow us to have so they removed it when they went on-die (so since
        Ironlake at least).  Now Alex Williamson added support for VGA
        arbitration for newer GPUs however this now exposes itself to
        userspace as requireing arbitration of GPU VGA regions and the X
        server gets involved and disables things that it can't handle when VGA
        access is possibly required around every operation.
      
        So in order to not break userspace we just reverted things back to the
        old known broken status so maybe we can try and design out way out.
      
        Ville also had a patch to use stop machine for the two times Intel
        needs to access VGA space, that might be acceptable with some rework,
        but for now myself and Daniel agreed to just go back"
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: (23 commits)
        Revert "i915: Update VGA arbiter support for newer devices"
        Revert "drm/i915: Delay disabling of VGA memory until vgacon->fbcon handoff is done"
        drm/radeon: re-enable sw ACR support on pre-DCE4
        drm/radeon/dpm: disable bapm on TN asics
        drm/radeon: improve soft reset on CIK
        drm/radeon: improve soft reset on SI
        drm/radeon/dpm: off by one in si_set_mc_special_registers()
        drm/radeon/dpm/btc: off by one in btc_set_mc_special_registers()
        drm/radeon: forever loop on error in radeon_do_test_moves()
        drm/radeon: fix hw contexts for SUMO2 asics
        drm/radeon: fix typo in CP DMA register headers
        drm/radeon/dpm: disable multiple UVD states
        drm/radeon: use hw generated CTS/N values for audio
        drm/radeon: fix N/CTS clock matching for audio
        drm/radeon: use 64-bit math to calculate CTS values for audio (v2)
        drm/edid: catch kmalloc failure in drm_edid_to_speaker_allocation
        Revert "drm/fb-helper: don't sleep for screen unblank when an oops is in progress"
        drm/gma500: fix things after get/put page helpers
        drm/nouveau/mc: disable msi support by default, it's busted in tons of places
        drm/i915: Only apply DPMS to the encoder if enabled
        ...
      cd4edf7a
    • Dave Airlie's avatar
      Revert "i915: Update VGA arbiter support for newer devices" · ebff5fa9
      Dave Airlie authored
      This reverts commit 81b5c7bc.
      
      Adding drm/i915 into the vga arbiter chain means that X (in a piece of
      well-meant paranoia) will do a get/put on the vga decoding around
      _every_ accel call down into the ddx. Which results in some nice
      performance disasters [1]. This really breaks userspace, by disabling
      DRI for everyone, and stops OpenGL from working, this isn't limited
      to just the i915 but both the integrated and discrete GPUs on
      multi-gpu systems, in other words this causes untold worlds of pain,
      
      Ville tried to come up with a Great Hack to fiddle the required VGA
      I/O ops behind everyone's back using stop_machine, but that didn't
      really work out [2]. Given that we're fairly late in the -rc stage for
      such games let's just revert this all.
      
      One thing we might want to keep is to delay the disabling of the vga
      decoding until the fbdev emulation and the fbcon screen is set up. If
      we kill vga mem decoding beforehand fbcon can end up with a white
      square in the top-left corner it tried to save from the vga memory for
      a seamless transition. And we have bug reports on older platforms
      which seem to match these symptoms.
      
      But again that's something to play around with in -next.
      
      References: [1] http://lists.x.org/archives/xorg-devel/2013-September/037763.html
      References: [2] http://www.spinics.net/lists/intel-gfx/msg34062.html
      Cc: Alex Williamson <alex.williamson@redhat.com>
      Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
      Cc: Chris Wilson <chris@chris-wilson.co.uk>
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      ebff5fa9
    • Dave Airlie's avatar
      Revert "drm/i915: Delay disabling of VGA memory until vgacon->fbcon handoff is done" · e1264ebe
      Dave Airlie authored
      This reverts commit 6e1b4fda.
      
      This is part of a revert due to a userspace breakage, better explained in the revert of 1a1a4cbf4906a13c0c377f708df5d94168e7b582.
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      e1264ebe
    • Dave Airlie's avatar
      Merge branch 'drm-fixes-3.12' of git://people.freedesktop.org/~agd5f/linux into drm-fixes · 23026285
      Dave Airlie authored
      Regression fixes for audio and UVD, several hang fixes,
      some DPM fixes.
      
      * 'drm-fixes-3.12' of git://people.freedesktop.org/~agd5f/linux:
        drm/radeon: re-enable sw ACR support on pre-DCE4
        drm/radeon/dpm: disable bapm on TN asics
        drm/radeon: improve soft reset on CIK
        drm/radeon: improve soft reset on SI
        drm/radeon/dpm: off by one in si_set_mc_special_registers()
        drm/radeon/dpm/btc: off by one in btc_set_mc_special_registers()
        drm/radeon: forever loop on error in radeon_do_test_moves()
        drm/radeon: fix hw contexts for SUMO2 asics
        drm/radeon: fix typo in CP DMA register headers
        drm/radeon/dpm: disable multiple UVD states
        drm/radeon: use hw generated CTS/N values for audio
        drm/radeon: fix N/CTS clock matching for audio
        drm/radeon: use 64-bit math to calculate CTS values for audio (v2)
        drm/edid: catch kmalloc failure in drm_edid_to_speaker_allocation
      23026285
    • Kent Overstreet's avatar
      bcache: Fix a null ptr deref regression · 2fe80d3b
      Kent Overstreet authored
      Commit c0f04d88 ("bcache: Fix flushes in writeback mode") was fixing
      a reported data corruption bug, but it seems some last minute
      refactoring or rebasing introduced a null pointer deref.
      Signed-off-by: default avatarKent Overstreet <kmo@daterainc.com>
      Cc: linux-stable <stable@vger.kernel.org> # >= v3.10
      Reported-by: default avatarGabriel de Perthuis <g2p.code@gmail.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      2fe80d3b
    • Linus Torvalds's avatar
      Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging · e3e8ded0
      Linus Torvalds authored
      Pull hwmon fix from Guenter Roeck:
       "Fix root cause of crash/error seen in applesmc driver"
      
      * tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
        hwmon: (applesmc) Always read until end of data
      e3e8ded0
    • Linus Torvalds's avatar
      Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild · 2d9d0282
      Linus Torvalds authored
      Pull kbuild fix from Michal Marek:
       "Here is an ARM Makefile fix that you even acked.  After nobody wanted
        to take it, it ended up in the kbuild tree"
      
      * 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
        arm, kbuild: make "make install" not depend on vmlinux
      2d9d0282
  3. 10 Oct, 2013 12 commits
  4. 09 Oct, 2013 17 commits