git.maquefel.me Git - linux.git/commit

author	Dave Airlie <airlied@redhat.com>
	Tue, 20 Apr 2010 03:16:04 +0000 (13:16 +1000)
committer	Dave Airlie <airlied@redhat.com>
	Tue, 20 Apr 2010 03:16:04 +0000 (13:16 +1000)
commit	7fff400be6fbf64f10abca9939718aaf1d61c255
tree	384118628f5c5aa2d74303cddd120de75308beea	tree \| snapshot
parent	0bcb1d844ac638a4c4280f697d5bfac9791e9a70	commit \| diff
parent	b1f201980eb4a7a59277a13cf18acdbb46167ad5	commit \| diff

Merge branch 'drm-fbdev-cleanup' into drm-core-next

* drm-fbdev-cleanup:
  drm/fb: remove drm_fb_helper_setcolreg
  drm/kms/fb: use slow work mechanism for normal hotplug also.
  drm/kms/fb: add polling support for when nothing is connected.
  drm/kms/fb: provide a 1024x768 fbcon if no outputs found.
  drm/kms/fb: separate fbdev connector list from core drm connectors
  drm/kms/fb: move to using fb helper crtc grouping instead of core crtc list
  drm/fb: fix fbdev object model + cleanup properly.

Conflicts:
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/nouveau/nouveau_drv.h

19 files changed:

drivers/gpu/drm/drm_crtc.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_fb_helper.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_dma.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_drv.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_irq.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_display.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_drv.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_fb.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nouveau_drv.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nouveau_fbcon.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nouveau_irq.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nouveau_state.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nv50_display.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nv50_fbcon.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/radeon.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/radeon_connectors.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/radeon_device.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/radeon_fb.c	diff1 \|	diff2 \|	blob \| history
include/drm/drm_crtc.h	diff1 \|	diff2 \|	blob \| history

ep93xx device tree rework repo: git://git.maquefel.me/linux.git

RSS Atom

drivers/gpu/drm/drm_crtc.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/drm_fb_helper.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_dma.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_drv.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/i915_irq.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_display.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_drv.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/i915/intel_fb.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nouveau_drv.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nouveau_fbcon.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nouveau_irq.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nouveau_state.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nv50_display.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/nouveau/nv50_fbcon.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/radeon.h	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/radeon_connectors.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/radeon_device.c	diff1 \|	diff2 \|	blob \| history
drivers/gpu/drm/radeon/radeon_fb.c	diff1 \|	diff2 \|	blob \| history
include/drm/drm_crtc.h	diff1 \|	diff2 \|	blob \| history