diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-01-28 06:12:38 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-01-28 06:12:38 +0300 |
commit | c59c961ca511dc7ee2f4f7e9c224d16f5c76ca6e (patch) | |
tree | e23a9081fc3a589bbc7a0719fe64787e7c9bbbdf /arch/x86/vdso/Makefile | |
parent | 59343cd7c4809cf7598789e1cd14563780ae4239 (diff) | |
parent | 5159571ceb44eba9bf9f9a34ec625386d421de9c (diff) | |
download | linux-c59c961ca511dc7ee2f4f7e9c224d16f5c76ca6e.tar.xz |
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Pull drm fixes from Dave Airlie:
"This feels larger than I'd like but its for three reasons.
a) amdkfd finalising the API more, this is a new feature introduced
last merge window, and I'd prefer to make the tweaks to the API
before it first gets into a stable release.
b) radeon regression required splitting an internal API to fix
properly, so it just changed a few more lines
c) vmwgfx fix changes a lock from a mutex->spin lock, this is fallout
from the new sleep checking.
Otherwise there is just some tda998x fixes"
* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
drm/radeon: Remove rdev->gart.pages_addr array
drm/radeon: Restore GART table contents after pinning it in VRAM v3
drm/radeon: Split off gart_get_page_entry ASIC hook from set_page_entry
drm/amdkfd: Fix bug in call to init_pipelines()
drm/amdkfd: Fix bug in pipelines initialization
drm/radeon: Don't increment pipe_id in kgd_init_pipeline
drm/i2c: tda998x: set the CEC I2C address based on the slave I2C address
drm/vmwgfx: Replace the hw mutex with a hw spinlock
drm/amdkfd: Allow user to limit only queues per device
drm/amdkfd: PQM handle queue creation fault
drm: tda998x: Fix EDID read timeout on HDMI connect
drm: tda998x: Protect the page register
Diffstat (limited to 'arch/x86/vdso/Makefile')
0 files changed, 0 insertions, 0 deletions