Merge branch 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: drm: fix ordering of driver unload vs agp unload. drm/i915: Respect the other stolen memory sizes we know of. drm/i915: Non-mobile parts don't have integrated TV-out. drm/i915: Add support for integrated HDMI on G4X hardware. drm/i915: Pin cursor bo and unpin old bo when setting cursor. drm/i915: Don't allow objects to get bound while VT switched.
Showing
- drivers/gpu/drm/drm_drv.c 3 additions, 3 deletionsdrivers/gpu/drm/drm_drv.c
- drivers/gpu/drm/i915/Makefile 1 addition, 0 deletionsdrivers/gpu/drm/i915/Makefile
- drivers/gpu/drm/i915/i915_dma.c 33 additions, 13 deletionsdrivers/gpu/drm/i915/i915_dma.c
- drivers/gpu/drm/i915/i915_drv.h 2 additions, 0 deletionsdrivers/gpu/drm/i915/i915_drv.h
- drivers/gpu/drm/i915/i915_gem.c 9 additions, 6 deletionsdrivers/gpu/drm/i915/i915_gem.c
- drivers/gpu/drm/i915/i915_reg.h 24 additions, 1 deletiondrivers/gpu/drm/i915/i915_reg.h
- drivers/gpu/drm/i915/intel_display.c 37 additions, 11 deletionsdrivers/gpu/drm/i915/intel_display.c
- drivers/gpu/drm/i915/intel_drv.h 4 additions, 1 deletiondrivers/gpu/drm/i915/intel_drv.h
- drivers/gpu/drm/i915/intel_hdmi.c 280 additions, 0 deletionsdrivers/gpu/drm/i915/intel_hdmi.c
- drivers/gpu/drm/i915/intel_sdvo.c 4 additions, 4 deletionsdrivers/gpu/drm/i915/intel_sdvo.c
Loading
Please register or sign in to comment