[Intel-gfx] [PATCH 6/6] drm/i915: Final split into two modules

[Richard Purdie]

This patch finished splitting the i915 module into two parts, a common
intel_vdc module which can be used by other drivers and a separate
i915 module.

Signed-off-by: Richard Purdie <rpurdie at linux.intel.com>

Index: git/drivers/gpu/drm/i915/intel_modes.c
===================================================================
--- git.orig/drivers/gpu/drm/i915/intel_modes.c	2009-05-13 13:23:59.000000000 +0100
+++ git/drivers/gpu/drm/i915/intel_modes.c	2009-05-13 13:27:22.000000000 +0100
@@ -83,3 +83,5 @@
 	return ret;
 }
 EXPORT_SYMBOL(intel_ddc_get_modes);
+
+MODULE_LICENSE("GPL and additional rights");
Index: git/drivers/gpu/drm/i915/Makefile
===================================================================
--- git.orig/drivers/gpu/drm/i915/Makefile	2009-05-13 13:23:59.000000000 +0100
+++ git/drivers/gpu/drm/i915/Makefile	2009-05-13 13:27:22.000000000 +0100
@@ -4,22 +4,24 @@
 
 ccflags-y := -Iinclude/drm
 i915-y := i915_drv.o i915_dma.o i915_irq.o i915_mem.o \
-          i915_suspend.o \
 	  i915_gem.o \
 	  i915_gem_debug.o \
 	  i915_gem_debugfs.o \
 	  i915_gem_tiling.o \
+	  intel_bios.o \
+	  intel_tv.o
+
+intel_vdc-y := \
 	  intel_display.o \
 	  intel_crt.o \
 	  intel_lvds.o \
-	  intel_bios.o \
 	  intel_hdmi.o \
 	  intel_sdvo.o \
 	  intel_modes.o \
 	  intel_i2c.o \
 	  intel_fb.o \
-	  intel_tv.o \
 	  intel_dvo.o \
+	  i915_suspend.o \
 	  dvo_ch7xxx.o \
 	  dvo_ch7017.o \
 	  dvo_ivch.o \
@@ -30,3 +32,4 @@
 i915-$(CONFIG_COMPAT)   += i915_ioc32.o
 
 obj-$(CONFIG_DRM_I915)  += i915.o
+obj-$(CONFIG_DRM_INTEL_VDC) += intel_vdc.o
Index: git/drivers/gpu/drm/Kconfig
===================================================================
--- git.orig/drivers/gpu/drm/Kconfig	2009-05-13 13:23:59.000000000 +0100
+++ git/drivers/gpu/drm/Kconfig	2009-05-13 13:27:22.000000000 +0100
@@ -43,6 +43,11 @@
 
 	  If M is selected, the module will be called radeon.
 
+config DRM_INTEL_VDC
+	tristate
+	help
+	  Video Display Controller code common to several Intel drivers (autoselected)
+
 config DRM_I810
 	tristate "Intel I810"
 	depends on DRM && AGP && AGP_INTEL
@@ -70,6 +75,7 @@
 	select FB_CFB_FILLRECT
 	select FB_CFB_COPYAREA
 	select FB_CFB_IMAGEBLIT
+	select DRM_INTEL_VDC
 	select FB
 	tristate "i915 driver"
 	help
Index: git/drivers/gpu/drm/Makefile
===================================================================
--- git.orig/drivers/gpu/drm/Makefile	2009-05-13 13:23:59.000000000 +0100
+++ git/drivers/gpu/drm/Makefile	2009-05-13 13:27:22.000000000 +0100
@@ -22,7 +22,7 @@
 obj-$(CONFIG_DRM_MGA)	+= mga/
 obj-$(CONFIG_DRM_I810)	+= i810/
 obj-$(CONFIG_DRM_I830)	+= i830/
-obj-$(CONFIG_DRM_I915)  += i915/
+obj-$(CONFIG_DRM_INTEL_VDC)  += i915/
 obj-$(CONFIG_DRM_SIS)   += sis/
 obj-$(CONFIG_DRM_SAVAGE)+= savage/
 obj-$(CONFIG_DRM_VIA)	+=via/
Index: git/drivers/gpu/drm/i915/i915_drv.c
===================================================================
--- git.orig/drivers/gpu/drm/i915/i915_drv.c	2009-05-13 13:23:59.000000000 +0100
+++ git/drivers/gpu/drm/i915/i915_drv.c	2009-05-13 13:27:22.000000000 +0100
@@ -39,9 +39,6 @@
 static unsigned int i915_modeset = 1;
 module_param_named(modeset, i915_modeset, int, 0400);
 
-unsigned int i915_fbpercrtc = 0;
-module_param_named(fbpercrtc, i915_fbpercrtc, int, 0400);
-
 static struct drm_driver driver;
 
 static struct pci_device_id pciidlist[] = {
Index: git/drivers/gpu/drm/i915/intel_fb.c
===================================================================
--- git.orig/drivers/gpu/drm/i915/intel_fb.c	2009-05-13 13:27:21.000000000 +0100
+++ git/drivers/gpu/drm/i915/intel_fb.c	2009-05-13 13:27:22.000000000 +0100
@@ -43,6 +43,9 @@
 #include "i915_drm.h"
 #include "i915_drv.h"
 
+unsigned int i915_fbpercrtc = 0;
+module_param_named(fbpercrtc, i915_fbpercrtc, int, 0400);
+
 struct intelfb_par {
 	struct drm_device *dev;
 	struct drm_display_mode *our_mode;
Index: git/drivers/gpu/drm/i915/intel_display.c
===================================================================
--- git.orig/drivers/gpu/drm/i915/intel_display.c	2009-05-13 13:27:21.000000000 +0100
+++ git/drivers/gpu/drm/i915/intel_display.c	2009-05-13 13:27:22.000000000 +0100
@@ -1791,11 +1791,6 @@
 	intel_crtc->mode_set.connectors = (struct drm_connector **)(intel_crtc + 1);
 	intel_crtc->mode_set.num_connectors = 0;
 
-	if (i915_fbpercrtc) {
-
-
-
-	}
 }
 EXPORT_SYMBOL(intel_crtc_init);