1. 12 Dec, 2013 8 commits
  2. 11 Dec, 2013 1 commit
    • Daniel Vetter's avatar
      drm/i915: don't update the dri1 breadcrumb with modesetting · 6c719fac
      Daniel Vetter authored
      The update is horribly racy since it doesn't protect at all against
      concurrent closing of the master fd. And it can't really since that
      requires us to grab a mutex.
      
      Instead of jumping through hoops and offloading this to a worker
      thread just block this bit of code for the modesetting driver.
      
      Note that the race is fairly easy to hit since we call the breadcrumb
      function for any interrupt. So the vblank interrupt (which usually
      keeps going for a bit) is enough. But even if we'd block this and only
      update the breadcrumb for user interrupts from the CS we could hit
      this race with kms/gem userspace: If a non-master is waiting somewhere
      (and hence has interrupts enabled) and the master closes its fd
      (probably due to crashing).
      
      v2: Add a code comment to explain why fixing this for real isn't
      really worth it. Also improve the commit message a bit.
      
      v3: Fix the spelling in the comment.
      Reported-by: default avatarEugene Shatokhin <eugene.shatokhin@rosalab.ru>
      Cc: Eugene Shatokhin <eugene.shatokhin@rosalab.ru>
      Cc: stable@vger.kernel.org
      Acked-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
      Tested-by: default avatarEugene Shatokhin <eugene.shatokhin@rosalab.ru>
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      6c719fac
  3. 10 Dec, 2013 26 commits
  4. 09 Dec, 2013 5 commits
    • Linus Torvalds's avatar
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · 78fd8223
      Linus Torvalds authored
      Pull drm fixes from Dave Airlie:
       "This is probably a bit big, but just because I fell behind last week
        and didn't get to doing any pulls, so stuff backed up behind me, I
        actually should have sent this for -rc3 but failed to even manage
        that.
      
        So this has radeon, intel, nouveau, vmware, exynos and tegra fixes in
        it, and the line count isn't all the bad in the end"
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: (50 commits)
        drm: fix the addition of the side-by-side (half) flag for extra 3D modes
        drm/edid: fix length check when adding extra 3D modes
        drm/radeon/atom: fix bus probes when hw_i2c is set (v2)
        drm/radeon: fix null pointer dereference in dce6+ audio code
        drm/radeon: fixup bad vram size on SI
        udl: fix issue with imported prime buffers
        drm/vmwgfx: Add our connectors to sysfs
        drm/vmwgfx: Fix dma buffer memory size accounting
        drm/vmwgfx: Fix up and comment the dumb buffer implementation
        drm/vmwgfx: Correctly set the enabled state on crtcs
        drm/nv50/disp: min/max are reversed in nv50_crtc_gamma_set()
        drm/nouveau/sw: fix oops if gpu has its display block disabled
        drm/nouveau: unreference fence after syncing
        drm/nouveau/kms: send timestamp data for correct head in flip completion events
        drm/nouveau/clk: Add support for NVAA/NVAC
        drm/nouveau/fifo: Hook up pause and resume for NV50 and NV84+
        drm/nv10/plane: some chipsets don't support NV12
        drm/nv10/plane: add downscaling restrictions
        drm/nv10/plane: fix format computation
        drm/nv04-nv30/clk: provide an empty domain list
        ...
      78fd8223
    • Linus Torvalds's avatar
      Merge tag 'mfd-fixes-3.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-fixes · 32ac4869
      Linus Torvalds authored
      Pull mfd fixes from Samuel Ortiz:
       "This is the first 3.13 pull request for MFD fixes.  We have:
      
         - A ti-ssp build failure fix
         - An as3722 build failure fix
         - An lpc_ich copy paste error fix"
      
      * tag 'mfd-fixes-3.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-fixes:
        mfd: lpc_ich: Fix Wildcat Point info name field
        mfd: ti-ssp: Fix build
        mfd: Make MFD_AS3722 depend on I2C=y
      32ac4869
    • Linus Torvalds's avatar
      Merge tag 'pm-3.13-rc3-fixup' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 77bd2adb
      Linus Torvalds authored
      Pull power management fixup from Rafael Wysocki:
       "This reverts two cpufreq commits that fixed issues for some people,
        but broke things for others, so revert them and we'll need to fix the
        original problems differently"
      
      * tag 'pm-3.13-rc3-fixup' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        Revert "cpufreq: fix garbage kobjects on errors during suspend/resume"
        Revert "cpufreq: suspend governors on system suspend/hibernate"
      77bd2adb
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · 754ac457
      Linus Torvalds authored
      Pull input updates from Dmitry Torokhov:
       "An update to ALPS to support devices on Dell XT2 (hopefully working
        better this time around and although it is largish it should not
        affect any other ALPS devices) and a tiny update to Elantech driver to
        support newer devices as well.
      
        Also a coupe of new input event codes have been defined"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
        Input: ALPS - add support for DualPoint device on Dell XT2 model
        Input: elantech - add support for newer (August 2013) devices
        Input: add SW_MUTE_DEVICE switch definition
        Input: usbtouchscreen - separate report and transmit buffer size handling
        Input: sur40 - suppress false uninitialized variable warning
        Input: add key code for ambient light sensor button
        Input: keyboard - "keycode & KEY_MAX" changes some keycode values
      754ac457
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · b6db4eb0
      Linus Torvalds authored
      Pull crypto fix from Herbert Xu:
       "Unfortunately the last push that fixed a crash in the crypto
        scatterwalk code introduced a new crash when SG debugging is enabled.
        This fixes that"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
        crypto: scatterwalk - Use sg_chain_ptr on chain entries
      b6db4eb0