• D
    Merge tag 'drm-intel-next-2014-04-16' of git://anongit.freedesktop.org/drm-intel into drm-next · 885ac04a
    Dave Airlie 提交于
    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
    885ac04a
intel_bios.c 33.1 KB