1. 07 Oct, 2014 1 commit
    • Dave Airlie's avatar
      Merge branch 'drm-next-3.18' of git://people.freedesktop.org/~agd5f/linux into drm-next · ccb09a8e
      Dave Airlie authored
      It looks like you missed my last 3.18 pull from 9/24.  This one
      includes those patches and a few more on top.  The additional patches are:
      - Maarten's radeon fence updates
      - Some additional debugging output
      From the previous pull request:
      - Re-enable some dpm features that were previously disabled due
        to a bug that was fixed in 3.16
      - Make some arrays static
      - re-arrange some audio code to properly reflect connected status
        in the audio driver
      
      * 'drm-next-3.18' of git://people.freedesktop.org/~agd5f/linux:
        drm/radeon/kv: add uvd/vce info to dpm debugfs output
        drm/radeon/ci: add uvd/vce info to dpm debugfs output
        drm/radeon: export reservation_object from dmabuf to ttm
        drm/radeon: cope with foreign fences inside the reservation object
        drm/radeon: cope with foreign fences inside display
        drm/radeon/cik: write gfx ucode version to ucode addr reg
        drm/radeon/si: print full CS when we hit a packet 0
        drm/radeon: remove unecessary includes
        drm/radeon/combios: declare legacy_connector_convert as static
        drm/radeon/atombios: declare connector convert tables as static
        drm/radeon: drop btc_get_max_clock_from_voltage_dependency_table
        drm/radeon/dpm: drop clk/voltage dependency filters for BTC
        drm/radeon/dpm: drop clk/voltage dependency filters for CI
        drm/radeon/dpm: drop clk/voltage dependency filters for SI
        drm/radeon/dpm: drop clk/voltage dependency filters for NI
        drm/radeon: disable audio when we disable hdmi (v2)
        drm/radeon: split audio enable between eg and r600 (v2)
        drm/radeon: consolidate r600_audio.c into r600_hdmi.c
        drm/radeon: consolidate duplicate encode is digital function
        drm/radeon: fix register name to match internal name
      ccb09a8e
  2. 03 Oct, 2014 5 commits
  3. 01 Oct, 2014 18 commits
  4. 30 Sep, 2014 6 commits
  5. 25 Sep, 2014 1 commit
    • Daniel Vetter's avatar
      drm: Drop grab fpriv->fbs_lock in drm_fb_release · 1b116297
      Daniel Vetter authored
      Paulo Zanoni reported a lockdep splat with a locking inversion between
      fpriv->fbs_lock and the modeset locks. This issue was introduced in
      
      commit f2b50c11
      Author: Daniel Vetter <daniel.vetter@ffwll.ch>
      Date:   Fri Sep 12 17:07:32 2014 +0200
      
          drm: Fixup locking for universal cursor planes
      
      This here is actually one of the rare cases where lockdep hits a false
      positive: The deadlock only happens in drm_fb_release, which cleans up
      the file private structure when all the references are gone. So the
      locking is the very last one and no one else can deadlock. It also
      doesn't protect anything at all, since all ioctls are guaranteed to
      have returned at this point - otherwise they'd still hold a reference
      on the file.
      
      So let's just drop it and replace it with a big comment.
      
      Cc: David Herrmann <dh.herrmann@gmail.com>
      Cc: Matt Roper <matthew.d.roper@intel.com>
      Cc: Paulo Zanoni <przanoni@gmail.com>
      Reported-and-Tested-by: default avatarPaulo Zanoni <przanoni@gmail.com>
      Reviewed-by: default avatarMatt Roper <matthew.d.roper@intel.com>
      Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
      1b116297
  6. 24 Sep, 2014 9 commits