[lkml]   [2014]   [Jul]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Subject[git pull] drm fixes (make Linus grumpy)

Hi Linus,

This is radeon and intel fixes, and is a small bit larger than I'm
guessing you'd like it to be,

i915: fixes 32-bit highmem i915 blank screen, semaphore hang and runtime
pm fix
radeon: gpuvm stability fix for hangs since 3.15, and hang/reboot
regression on TN/RL devices,

The only slightly controversial one is the change to use GB forthe
vm_size, which I'm letting through as its a new interface we defined in
this merge window, and I'd prefer to have the released kernel have the
final interface rather than changing it later.

but push back if you really don't like anything!


The following changes since commit 67dd8f35c2d8ed80f26c9654b474cffc11c6674d:

Merge branch 'v4l_for_linus' of git:// (2014-07-21 11:44:34 -0700)

are available in the git repository at:

git:// drm-fixes

for you to fetch changes up to 1b2c4869d8247f9e202fa8a73777c34adc62d409:

drm/radeon: fix cut and paste issue for hawaii. (2014-07-25 09:17:35 +1000)

Alex Deucher (1):
drm/radeon/TN: only enable bapm on MSI systems

Chris Wilson (2):
drm/i915: Reorder the semaphore deadlock check, again
drm/i915: Simplify i915_gem_release_all_mmaps()

Christian König (5):
drm/radeon: let's use GB for vm_size (v2)
drm/radeon: fix handling of radeon_vm_bo_rmv v3
drm/radeon: fix VM IB handling
drm/radeon: fix error handling in radeon_vm_bo_set_addr
drm/radeon: fix irq ring buffer overflow handling

Dave Airlie (3):
Merge branch 'drm-fixes-3.16' of git:// into drm-fixes
Merge tag 'drm-intel-fixes-2014-07-24' of git:// into drm-fixes
Merge branch 'drm-fixes-3.16' of git:// into drm-fixes

Hugh Dickins (1):
drm/i915: fix freeze with blank screen booting highmem

Jerome Glisse (1):
drm/radeon: fix cut and paste issue for hawaii.

drivers/gpu/drm/i915/i915_gem.c | 25 +++-----
drivers/gpu/drm/i915/i915_gem_render_state.c | 4 +-
drivers/gpu/drm/i915/i915_irq.c | 11 ++--
drivers/gpu/drm/radeon/cik.c | 2 +
drivers/gpu/drm/radeon/evergreen.c | 1 +
drivers/gpu/drm/radeon/r600.c | 1 +
drivers/gpu/drm/radeon/radeon.h | 15 +++--
drivers/gpu/drm/radeon/radeon_cs.c | 20 ++++++-
drivers/gpu/drm/radeon/radeon_device.c | 22 +++----
drivers/gpu/drm/radeon/radeon_drv.c | 4 +-
drivers/gpu/drm/radeon/radeon_kms.c | 26 ++++-----
drivers/gpu/drm/radeon/radeon_vm.c | 87 ++++++++++++++++++++--------
drivers/gpu/drm/radeon/si.c | 1 +
drivers/gpu/drm/radeon/trinity_dpm.c | 15 ++---
14 files changed, 146 insertions(+), 88 deletions(-)
 \ /
  Last update: 2014-07-25 02:41    [W:0.032 / U:1.064 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site