diff options
author | Dave Airlie <airlied@redhat.com> | 2015-08-17 16:03:48 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2015-08-17 16:03:48 +1000 |
commit | 294947a5c7f6d228b70fcc51a89527e74a38a2c5 (patch) | |
tree | d0f79f3978a1a129e164ce576a771e00550fb985 /drivers/ide/ide-atapi.c | |
parent | 6406e45cc6f4976ace2b6d23b76bb5f07541e68f (diff) | |
parent | 54fbde8a94a8a78547597215c9e4be590d075ee0 (diff) | |
download | blackbird-op-linux-294947a5c7f6d228b70fcc51a89527e74a38a2c5.tar.gz blackbird-op-linux-294947a5c7f6d228b70fcc51a89527e74a38a2c5.zip |
Merge branch 'vmwgfx-next' of git://people.freedesktop.org/~thomash/linux into drm-next
A couple of fixes from the previous pull request as well as gl3 support.
There is one drm core change, an export of a previously private function.
Take 2 implementing screen targets, this time with the fbdev code adjusted
accordingly.
Also there is an implementation of register-driven command buffers, that
overrides the FIFO ring for command processing. It's needed for our upcoming
hardware revision.
* 'vmwgfx-next' of git://people.freedesktop.org/~thomash/linux: (35 commits)
drm/vmwgfx: Fix copyright headers
drm/vmwgfx: Add DX query support. Various fixes.
drm/vmwgfx: Add command parser support for a couple of DX commands
drm/vmwgfx: Command parser fixes for DX
drm/vmwgfx: Initial DX support
drm/vmwgfx: Update device includes for DX device functionality
drm: export the DRM permission check code
drm/vmwgfx: Fix crash when unloading vmwgfx v2
drm/vmwgfx: Fix framebuffer creation on older hardware
drm/vmwgfx: Fixed topology boundary checking for Screen Targets
drm/vmwgfx: Fix an uninitialized value
drm/vmwgfx: Fix compiler warning with 32-bit dma_addr_t
drm/vmwgfx: Kill a bunch of sparse warnings
drm/vmwgfx: Fix kms preferred mode sorting
drm/vmwgfx: Reinstate the legacy display system dirty callback
drm/vmwgfx: Implement fbdev on kms v2
drm/vmwgfx: Add a kernel interface to create a framebuffer v2
drm/vmwgfx: Avoid cmdbuf alloc sleeping if !TASK_RUNNING
drm/vmwgfx: Convert screen targets to new helpers v3
drm/vmwgfx: Convert screen objects to the new helpers
...
Diffstat (limited to 'drivers/ide/ide-atapi.c')
0 files changed, 0 insertions, 0 deletions