• Dave Airlie's avatar
    Merge branch 'drm-fbdev-cleanup' into drm-core-next · 7fff400b
    Dave Airlie authored
    * 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
    7fff400b
i915_dma.c 50.5 KB