1. 27 Jan, 2017 7 commits
    • Dave Airlie's avatar
      Merge tag 'drm-intel-fixes-2017-01-26' of... · 736a1494
      Dave Airlie authored
      Merge tag 'drm-intel-fixes-2017-01-26' of git://anongit.freedesktop.org/git/drm-intel into drm-fixes
      
      More fixes than I'd like at this stage, but I think the holidays and
      conferences have delayed finding and fixing the stuff a bit. Almost all
      of them have Fixes: tags, so it's not just random fixes, we can point
      fingers at the commits that broke stuff.
      
      There's an ABI fix to GVT from Alex, before we go on an release a kernel
      with the wrong attribute name.
      
      * tag 'drm-intel-fixes-2017-01-26' of git://anongit.freedesktop.org/git/drm-intel:
        drm/i915: reinstate call to trace_i915_vma_bind
        drm/i915: Move atomic state free from out of fence release
        drm/i915: Check for NULL atomic state in intel_crtc_disable_noatomic()
        drm/i915: Fix calculation of rotated x and y offsets for planar formats
        drm/i915: Don't init hpd polling for vlv and chv from runtime_suspend()
        drm/i915: Don't leak edid in intel_crt_detect_ddc()
        drm/i915: Release temporary load-detect state upon switching
        drm/i915: prevent crash with .disable_display parameter
        drm/i915: Avoid drm_atomic_state_put(NULL) in intel_display_resume
        MAINTAINERS: update new mail list for intel gvt driver
        drm/i915/gvt: Fix kmem_cache_create() name
        drm/i915/gvt/kvmgt: mdev ABI is available_instances, not available_instance
        drm/i915/gvt: Fix relocation of shadow bb
        drm/i915/gvt: Enable the shadow batch buffer
      736a1494
    • Lyude Paul's avatar
      drm/nouveau: Handle fbcon suspend/resume in seperate worker · 15266ae3
      Lyude Paul authored
      Resuming from RPM can happen while already holding
      dev->mode_config.mutex. This means we can't actually handle fbcon in
      any RPM resume workers, since restoring fbcon requires grabbing
      dev->mode_config.mutex again. So move the fbcon suspend/resume code into
      it's own worker, and rely on that instead to avoid deadlocking.
      
      This fixes more deadlocks for runtime suspending the GPU on the ThinkPad
      W541. Reproduction recipe:
      
       - Get a machine with both optimus and a nvidia card with connectors
         attached to it
       - Wait for the nvidia GPU to suspend
       - Attempt to manually reprobe any of the connectors on the nvidia GPU
         using sysfs
       - *deadlock*
      
      [airlied: use READ_ONCE to address Hans's comment]
      Signed-off-by: default avatarLyude <lyude@redhat.com>
      Cc: Hans de Goede <hdegoede@redhat.com>
      Cc: Kilian Singer <kilian.singer@quantumtechnology.info>
      Cc: Lukas Wunner <lukas@wunner.de>
      Cc: David Airlie <airlied@redhat.com>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      15266ae3
    • Lyude Paul's avatar
      drm/nouveau: Don't enabling polling twice on runtime resume · cae9ff03
      Lyude Paul authored
      As it turns out, on cards that actually have CRTCs on them we're already
      calling drm_kms_helper_poll_enable(drm_dev) from
      nouveau_display_resume() before we call it in
      nouveau_pmops_runtime_resume(). This leads us to accidentally trying to
      enable polling twice, which results in a potential deadlock between the
      RPM locks and drm_dev->mode_config.mutex if we end up trying to enable
      polling the second time while output_poll_execute is running and holding
      the mode_config lock. As such, make sure we only enable polling in
      nouveau_pmops_runtime_resume() if we need to.
      
      This fixes hangs observed on the ThinkPad W541
      Signed-off-by: default avatarLyude <lyude@redhat.com>
      Cc: Hans de Goede <hdegoede@redhat.com>
      Cc: Kilian Singer <kilian.singer@quantumtechnology.info>
      Cc: Lukas Wunner <lukas@wunner.de>
      Cc: David Airlie <airlied@redhat.com>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      cae9ff03
    • Y.C. Chen's avatar
      drm/ast: Fixed system hanged if disable P2A · 6c971c09
      Y.C. Chen authored
      The original ast driver will access some BMC configuration through P2A bridge
      that can be disabled since AST2300 and after.
      It will cause system hanged if P2A bridge is disabled.
      Here is the update to fix it.
      Signed-off-by: default avatarY.C. Chen <yc_chen@aspeedtech.com>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      6c971c09
    • Dave Airlie's avatar
      Merge tag 'drm-vc4-fixes-2017-01-23' of https://github.com/anholt/linux into drm-fixes · e996598b
      Dave Airlie authored
      This pull request brings in a few little error checking fixes and one
      slow memory leak fix.
      
      * tag 'drm-vc4-fixes-2017-01-23' of https://github.com/anholt/linux:
        drm/vc4: Return -EINVAL on the overflow checks failing.
        drm/vc4: Fix an integer overflow in temporary allocation layout.
        drm/vc4: fix a bounds check
        drm/vc4: Fix memory leak of the CRTC state.
      e996598b
    • Dave Airlie's avatar
      Merge branch 'drm-fixes-4.10' of git://people.freedesktop.org/~agd5f/linux into drm-fixes · 1fb2d354
      Dave Airlie authored
      Just a few small fixes.
      
      * 'drm-fixes-4.10' of git://people.freedesktop.org/~agd5f/linux:
        Revert "drm/radeon: always apply pci shutdown callbacks"
        drm/amdgpu: fix unload driver issue for virtual display
        drm/amdgpu: check ring being ready before using
      1fb2d354
    • Dave Airlie's avatar
      Merge tag 'drm-misc-fixes-2017-01-23' of git://anongit.freedesktop.org/git/drm-misc into drm-fixes · 99f300cf
      Dave Airlie authored
      Single fence fix.
      * tag 'drm-misc-fixes-2017-01-23' of git://anongit.freedesktop.org/git/drm-misc:
        drm/fence: fix memory overwrite when setting out_fence fd
      99f300cf
  2. 26 Jan, 2017 3 commits
    • Eric Dumazet's avatar
      sysctl: fix proc_doulongvec_ms_jiffies_minmax() · ff9f8a7c
      Eric Dumazet authored
      We perform the conversion between kernel jiffies and ms only when
      exporting kernel value to user space.
      
      We need to do the opposite operation when value is written by user.
      
      Only matters when HZ != 1000
      Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      ff9f8a7c
    • Linus Torvalds's avatar
      Merge tag 'pinctrl-v4.10-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl · 928d336a
      Linus Torvalds authored
      Pull pin control fixes from Linus Walleij:
       "A bunch of pin control fixes for v4.10 that didn't get sent off until
        now, sorry for the delay.
      
        It's only driver fixes:
      
         - A bunch of fixes to the Intel drivers: broxton, baytrail. Bugs
           related to register offsets, IRQ, debounce functionality.
      
         - Fix a conflict amongst UART settings on the meson.
      
         - Fix the ethernet setting on the Uniphier.
      
         - A compilation warning squelched"
      
      * tag 'pinctrl-v4.10-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
        pinctrl: uniphier: fix Ethernet (RMII) pin-mux setting for LD20
        pinctrl: meson: fix uart_ao_b for GXBB and GXL/GXM
        pinctrl: amd: avoid maybe-uninitalized warning
        pinctrl: baytrail: Do not add all GPIOs to IRQ domain
        pinctrl: baytrail: Rectify debounce support
        pinctrl: intel: Set pin direction properly
        pinctrl: broxton: Use correct PADCFGLOCK offset
      928d336a
    • Linus Torvalds's avatar
      Merge tag 'drm-fixes-for-v4.10-rc6-revert-one' of git://people.freedesktop.org/~airlied/linux · bed7b016
      Linus Torvalds authored
      Pull drm revert from Dave Airlie:
       "Revert one patch missing some prereqs.
      
        One of the connector fixes was missing some prereqs, we have an
        alternate driver fix that should work that I'll send tomorrow.
      
        Today is a holiday here so quickly smashing this out"
      
      Daniel Vetter explains:
       "I pushed a locking change to fix a nouveau rpm issue to -fixes that
        needed the connector_list rework. And that's only in -next, but I
        missed that. Dave has the revert in a pull, and he'll follow-up with
        the hack nouveau patch for 4.10, and then we'll reapply the proper fix
        again for -next and revert the hacks. A bit a mess, but should be
        sorted soon"
      
      * tag 'drm-fixes-for-v4.10-rc6-revert-one' of git://people.freedesktop.org/~airlied/linux:
        Revert "drm/probe-helpers: Drop locking from poll_enable"
      bed7b016
  3. 25 Jan, 2017 30 commits