Skip to content
  1. Apr 02, 2016
  2. Apr 01, 2016
    • Linus Torvalds's avatar
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · 6ddf37da
      Linus Torvalds authored
      Pull drm fixes from Dave Airlie:
       "Nothing too crazy in here: a bunch of AMD fixes/quirks, two msm fixes,
        some rockchip fixes, and a udl warning fix, along with one locking fix
        for displayport that seems to fix some dodgy monitors"
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
        drm/udl: Use unlocked gem unreferencing
        drm/dp: move hw_mutex up the call stack
        drm/amdgpu: Don't move pinned BOs
        drm/radeon: Don't move pinned BOs
        drm/radeon: add a dpm quirk for all R7 370 parts
        drm/radeon: add another R7 370 quirk
        drm/rockchip: dw_hdmi: Don't call platform_set_drvdata()
        drm/rockchip: vop: Fix vop crtc cleanup
        drm/rockchip: dw_hdmi: Call drm_encoder_cleanup() in error path
        drm/rockchip: vop: Disable planes when disabling CRTC
        drm/rockchip: vop: Don't reject empty modesets
        drm/rockchip: cancel pending vblanks on close
        drm/rockchip: vop: fix crtc size in plane check
        drm/radeon: add a dpm quirk for sapphire Dual-X R7 370 2G D5
        drm/amd: Beef up ACP Kconfig menu text
        drm/msm: fix typo in the !COMMON_CLK case
        drm/msm: fix bug after preclose removal
      6ddf37da
    • Linus Torvalds's avatar
      Merge tag 'powerpc-4.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux · 52bef0cb
      Linus Torvalds authored
      Pull powerpc fixes from Michael Ellerman:
       - Fixup preempt underflow with huge pages from Sebastian Siewior
       - Fix altivec SPR not being saved from Oliver O'Halloran
       - Correct used_vsr comment from Simon Guo
      
      * tag 'powerpc-4.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
        powerpc: Correct used_vsr comment
        powerpc/process: Fix altivec SPR not being saved
        powerpc/mm: Fixup preempt underflow with huge pages
      52bef0cb
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · dc8a64ee
      Linus Torvalds authored
      Pull s390 fixes from Martin Schwidefsky:
       - A proper fix for the locking issue in the dasd driver
       - Wire up the new preadv2 nad pwritev2 system calls
       - Add the mark_rodata_ro function and set DEBUG_RODATA=y
       - A few more bug fixes.
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
        s390: wire up preadv2/pwritev2 syscalls
        s390/pci: PCI function group 0 is valid for clp_query_pci_fn
        s390/crypto: provide correct file mode at device register.
        s390/mm: handle PTE-mapped tail pages in fast gup
        s390: add DEBUG_RODATA support
        s390: disable postinit-readonly for now
        s390/dasd: reorder lcu and device lock
        s390/cpum_sf: Fix cpu hotplug notifier transitions
        s390/cpum_cf: Fix missing cpu hotplug notifier transition
      dc8a64ee
    • Takashi Iwai's avatar
      ALSA: timer: Use mod_timer() for rearming the system timer · 4a07083e
      Takashi Iwai authored
      
      
      ALSA system timer backend stops the timer via del_timer() without sync
      and leaves del_timer_sync() at the close instead.  This is because of
      the restriction by the design of ALSA timer: namely, the stop callback
      may be called from the timer handler, and calling the sync shall lead
      to a hangup.  However, this also triggers a kernel BUG() when the
      timer is rearmed immediately after stopping without sync:
       kernel BUG at kernel/time/timer.c:966!
       Call Trace:
        <IRQ>
        [<ffffffff8239c94e>] snd_timer_s_start+0x13e/0x1a0
        [<ffffffff8239e1f4>] snd_timer_interrupt+0x504/0xec0
        [<ffffffff8122fca0>] ? debug_check_no_locks_freed+0x290/0x290
        [<ffffffff8239ec64>] snd_timer_s_function+0xb4/0x120
        [<ffffffff81296b72>] call_timer_fn+0x162/0x520
        [<ffffffff81296add>] ? call_timer_fn+0xcd/0x520
        [<ffffffff8239ebb0>] ? snd_timer_interrupt+0xec0/0xec0
        ....
      
      It's the place where add_timer() checks the pending timer.  It's clear
      that this may happen after the immediate restart without sync in our
      cases.
      
      So, the workaround here is just to use mod_timer() instead of
      add_timer().  This looks like a band-aid fix, but it's a right move,
      as snd_timer_interrupt() takes care of the continuous rearm of timer.
      
      Reported-by: default avatarJiri Slaby <jslaby@suse.cz>
      Cc: <stable@vger.kernel.org>
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      4a07083e
    • Heiko Carstens's avatar
    • Pierre Morel's avatar
      s390/pci: PCI function group 0 is valid for clp_query_pci_fn · aa624886
      Pierre Morel authored
      
      
      The PCI function group 0 is a valid function group,
      it is wrong to reject it.
      
      Let's accept PCI function group 0.
      
      Signed-off-by: default avatarPierre Morel <pmorel@linux.vnet.ibm.com>
      Acked-by: default avatarSebastian Ott <sebott@linux.vnet.ibm.com>
      Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
      aa624886
    • Hui Wang's avatar
      ALSA: hda - fix front mic problem for a HP desktop · e549d190
      Hui Wang authored
      
      
      The front mic jack (pink color) can't detect any plug or unplug. After
      applying this fix, both detecting function and recording function
      work well.
      
      BugLink: https://bugs.launchpad.net/bugs/1564712
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarHui Wang <hui.wang@canonical.com>
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      e549d190
    • Daniel Vetter's avatar
      drm/udl: Use unlocked gem unreferencing · 72b9ff06
      Daniel Vetter authored
      For drm_gem_object_unreference callers are required to hold
      dev->struct_mutex, which these paths don't. Enforcing this requirement
      has become a bit more strict with
      
      commit ef4c6270
      
      
      Author: Daniel Vetter <daniel.vetter@ffwll.ch>
      Date:   Thu Oct 15 09:36:25 2015 +0200
      
          drm/gem: Check locking in drm_gem_object_unreference
      
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      72b9ff06
    • Rob Clark's avatar
      drm/dp: move hw_mutex up the call stack · 7779c5e2
      Rob Clark authored
      
      
      1) don't let other threads trying to bang on aux channel interrupt the
      defer timeout/logic
      2) don't let other threads interrupt the i2c over aux logic
      
      Technically, according to people who actually have the DP spec, this
      should not be required.  In practice, it makes some troublesome Dell
      monitor (and perhaps others) work, so probably a case of "It's compliant
      if it works with windows" on the hw vendor's part..
      
      v2: rebased to come before DPCD/AUX logging patch for easier backport
      to stable branches.
      
      Reported-by: default avatarDave Wysochanski <dwysocha@redhat.com>
      Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1274157
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarRob Clark <robdclark@gmail.com>
      Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
      Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      7779c5e2
    • Dave Airlie's avatar
      Merge branch 'drm-rockchip-next-fixes-2016-03-28' of... · 5456248d
      Dave Airlie authored
      Merge branch 'drm-rockchip-next-fixes-2016-03-28' of https://github.com/markyzq/kernel-drm-rockchip into drm-fixes
      
      bunch of rockchip fixes.
      
      * 'drm-rockchip-next-fixes-2016-03-28' of https://github.com/markyzq/kernel-drm-rockchip:
        drm/rockchip: dw_hdmi: Don't call platform_set_drvdata()
        drm/rockchip: vop: Fix vop crtc cleanup
        drm/rockchip: dw_hdmi: Call drm_encoder_cleanup() in error path
        drm/rockchip: vop: Disable planes when disabling CRTC
        drm/rockchip: vop: Don't reject empty modesets
        drm/rockchip: cancel pending vblanks on close
        drm/rockchip: vop: fix crtc size in plane check
      5456248d
    • Dave Airlie's avatar
      Merge branch 'msm-fixes-4.6-rc1' of git://people.freedesktop.org/~robclark/linux into drm-fixes · 90516d89
      Dave Airlie authored
      two minor msm fixes.
      
      * 'msm-fixes-4.6-rc1' of git://people.freedesktop.org/~robclark/linux:
        drm/msm: fix typo in the !COMMON_CLK case
        drm/msm: fix bug after preclose removal
      90516d89
    • Dave Airlie's avatar
      Merge branch 'drm-next-4.6' of git://people.freedesktop.org/~agd5f/linux into drm-fixes · 2f4fcb3e
      Dave Airlie authored
      Just a few fixes for 4.6 this week:
      - Add some SI DPM quirks
      - Improve the ACP Kconfig text
      - Additional BO pinning checks
      
      * 'drm-next-4.6' of git://people.freedesktop.org/~agd5f/linux:
        drm/amdgpu: Don't move pinned BOs
        drm/radeon: Don't move pinned BOs
        drm/radeon: add a dpm quirk for all R7 370 parts
        drm/radeon: add another R7 370 quirk
        drm/radeon: add a dpm quirk for sapphire Dual-X R7 370 2G D5
        drm/amd: Beef up ACP Kconfig menu text
      2f4fcb3e
    • Vladis Dronov's avatar
      ALSA: usb-audio: Fix double-free in error paths after snd_usb_add_audio_stream() call · 836b34a9
      Vladis Dronov authored
      create_fixed_stream_quirk(), snd_usb_parse_audio_interface() and
      create_uaxx_quirk() functions allocate the audioformat object by themselves
      and free it upon error before returning. However, once the object is linked
      to a stream, it's freed again in snd_usb_audio_pcm_free(), thus it'll be
      double-freed, eventually resulting in a memory corruption.
      
      This patch fixes these failures in the error paths by unlinking the audioformat
      object before freeing it.
      
      Based on a patch by Takashi Iwai <tiwai@suse.de>
      
      [Note for stable backports:
       this patch requires the commit 902eb7fd
      
       ('ALSA: usb-audio: Minor
       code cleanup in create_fixed_stream_quirk()')]
      
      Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1283358
      Reported-by: default avatarRalf Spenneberg <ralf@spenneberg.net>
      Cc: <stable@vger.kernel.org> # see the note above
      Signed-off-by: default avatarVladis Dronov <vdronov@redhat.com>
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      836b34a9
    • Martin Brandenburg's avatar
      orangefs: minimum userspace version is 2.9.3 · 878dfd32
      Martin Brandenburg authored
      
      
      Version 2.9.4 isn't even released yet.
      
      Signed-off-by: default avatarMartin Brandenburg <martin@omnibond.com>
      878dfd32
    • Martin Brandenburg's avatar
      orangefs: don't put readdir slot twice · 641bb324
      Martin Brandenburg authored
      
      
      This was quite an oversight. After a readdir, the module could not be
      unloaded, the number of slots is wrong, and memory near the slot bitmap
      is possibly corrupt. Oops.
      
      Signed-off-by: default avatarMartin Brandenburg <martin@omnibond.com>
      641bb324
  3. Mar 31, 2016