diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-05-01 09:11:37 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-05-01 09:11:37 +1000 |
| commit | 885ac04ab3a226d28147853d6d98eee3897a5636 (patch) | |
| tree | 6310f259c2f91525574fb330f62b56579450350e /drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | |
| parent | 8aa9e85adac609588eeec356e5a85059b3b819ba (diff) | |
| parent | c79057922ed6c2c6df1214e6ab4414fea1b23db2 (diff) | |
Merge tag 'drm-intel-next-2014-04-16' of git://anongit.freedesktop.org/drm-intel into drm-next
drm-intel-next-2014-04-16:
- vlv infoframe fixes from Jesse
- dsi/mipi fixes from Shobhit
- gen8 pageflip fixes for LRI/SRM from Damien
- cmd parser fixes from Brad Volkin
- some prep patches for CHV, DRRS, ...
- and tons of little things all over
drm-intel-next-2014-04-04:
- cmd parser for gen7 but only in enforcing and not yet granting mode - the
batch copying stuff is still missing. Also performance is a bit ... rough
(Brad Volkin + OACONTROL fix from Ken).
- deprecate UMS harder (i.e. CONFIG_BROKEN)
- interrupt rework from Paulo Zanoni
- runtime PM support for bdw and snb, again from Paulo
- a pile of refactorings from various people all over the place to prep for new
stuff (irq reworks, power domain polish, ...)
drm-intel-next-2014-04-04:
- cmd parser for gen7 but only in enforcing and not yet granting mode - the
batch copying stuff is still missing. Also performance is a bit ... rough
(Brad Volkin + OACONTROL fix from Ken).
- deprecate UMS harder (i.e. CONFIG_BROKEN)
- interrupt rework from Paulo Zanoni
- runtime PM support for bdw and snb, again from Paulo
- a pile of refactorings from various people all over the place to prep for new
stuff (irq reworks, power domain polish, ...)
Conflicts:
drivers/gpu/drm/i915/i915_gem_context.c
Diffstat (limited to 'drivers/gpu/drm/vmwgfx/vmwgfx_kms.c')
0 files changed, 0 insertions, 0 deletions