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

Browse source

* 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

...

This commit is contained in:

Dave Airlie 2010-04-20 13:16:04 +10:00

parent 0bcb1d844a b1f201980e

commit 7fff400be6

33 changed files with 1290 additions and 1209 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

18

include/drm/drm_crtc.h

View file

6

include/drm/drm_crtc_helper.h

View file

76

include/drm/drm_fb_helper.h

View file