From: Dave Airlie <airlied@redhat.com>
Date: Tue, 20 Apr 2010 03:16:04 +0000 (+1000)
Subject: Merge branch 'drm-fbdev-cleanup' into drm-core-next
X-Git-Tag: v2.6.35-rc1~451^2~87
X-Git-Url: https://bbs.cooldavid.org/git/?a=commitdiff_plain;h=7fff400be6fbf64f10abca9939718aaf1d61c255;p=net-next-2.6.git

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
---

7fff400be6fbf64f10abca9939718aaf1d61c255
diff --cc drivers/gpu/drm/i915/i915_drv.h
index 790fef32afe,0405a746059..1258b1119d9
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@@ -221,11 -220,8 +221,13 @@@ enum no_fbc_reason 
  	FBC_NOT_TILED, /* buffer not tiled */
  };
  
 +enum intel_pch {
 +	PCH_IBX,	/* Ibexpeak PCH */
 +	PCH_CPT,	/* Cougarpoint PCH */
 +};
 +
+ struct intel_fbdev;
+ 
  typedef struct drm_i915_private {
  	struct drm_device *dev;
  
diff --cc drivers/gpu/drm/nouveau/nouveau_drv.h
index ace630aa89e,941339cb8d8..5b47b79f45e
--- a/drivers/gpu/drm/nouveau/nouveau_drv.h
+++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
@@@ -533,8 -531,7 +533,9 @@@ struct drm_nouveau_private 
  		atomic_t validate_sequence;
  	} ttm;
  
 +	struct fb_info *fbdev_info;
 +
+ 	int fifo_alloc_count;
  	struct nouveau_channel *fifos[NOUVEAU_MAX_CHANNEL_NR];
  
  	struct nouveau_engine engine;
diff --cc drivers/gpu/drm/radeon/radeon_fb.c
index 9ac57a09784,d3ed4afdbde..fcb5b52727b
--- a/drivers/gpu/drm/radeon/radeon_fb.c
+++ b/drivers/gpu/drm/radeon/radeon_fb.c
@@@ -23,12 -23,7 +23,8 @@@
   * Authors:
   *     David Airlie
   */
-     /*
-      *  Modularization
-      */
- 
  #include <linux/module.h>
 +#include <linux/slab.h>
  #include <linux/fb.h>
  
  #include "drmP.h"