Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Pull drm fixes from Dave Airlie: "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 for the 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" * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: drm/radeon: fix cut and paste issue for hawaii. drm/radeon: fix irq ring buffer overflow handling drm/i915: Simplify i915_gem_release_all_mmaps() drm/radeon: fix error handling in radeon_vm_bo_set_addr drm/i915: fix freeze with blank screen booting highmem drm/i915: Reorder the semaphore deadlock check, again drm/radeon/TN: only enable bapm on MSI systems drm/radeon: fix VM IB handling drm/radeon: fix handling of radeon_vm_bo_rmv v3 drm/radeon: let's use GB for vm_size (v2)
Showing
- drivers/gpu/drm/i915/i915_gem.c 9 additions, 16 deletionsdrivers/gpu/drm/i915/i915_gem.c
- drivers/gpu/drm/i915/i915_gem_render_state.c 2 additions, 2 deletionsdrivers/gpu/drm/i915/i915_gem_render_state.c
- drivers/gpu/drm/i915/i915_irq.c 4 additions, 7 deletionsdrivers/gpu/drm/i915/i915_irq.c
- drivers/gpu/drm/radeon/cik.c 2 additions, 0 deletionsdrivers/gpu/drm/radeon/cik.c
- drivers/gpu/drm/radeon/evergreen.c 1 addition, 0 deletionsdrivers/gpu/drm/radeon/evergreen.c
- drivers/gpu/drm/radeon/r600.c 1 addition, 0 deletionsdrivers/gpu/drm/radeon/r600.c
- drivers/gpu/drm/radeon/radeon.h 11 additions, 4 deletionsdrivers/gpu/drm/radeon/radeon.h
- drivers/gpu/drm/radeon/radeon_cs.c 18 additions, 2 deletionsdrivers/gpu/drm/radeon/radeon_cs.c
- drivers/gpu/drm/radeon/radeon_device.c 11 additions, 11 deletionsdrivers/gpu/drm/radeon/radeon_device.c
- drivers/gpu/drm/radeon/radeon_drv.c 2 additions, 2 deletionsdrivers/gpu/drm/radeon/radeon_drv.c
- drivers/gpu/drm/radeon/radeon_kms.c 13 additions, 13 deletionsdrivers/gpu/drm/radeon/radeon_kms.c
- drivers/gpu/drm/radeon/radeon_vm.c 63 additions, 24 deletionsdrivers/gpu/drm/radeon/radeon_vm.c
- drivers/gpu/drm/radeon/si.c 1 addition, 0 deletionsdrivers/gpu/drm/radeon/si.c
- drivers/gpu/drm/radeon/trinity_dpm.c 8 additions, 7 deletionsdrivers/gpu/drm/radeon/trinity_dpm.c
Loading
Please register or sign in to comment