gma500: Move the basic driver out of staging
authorAlan Cox <alan@linux.intel.com>
Thu, 3 Nov 2011 18:20:47 +0000 (18:20 +0000)
committerDave Airlie <airlied@redhat.com>
Wed, 16 Nov 2011 11:19:54 +0000 (11:19 +0000)
This driver supports unaccelerated KMS display, and accelerated console
handling on the Intel Poulsbo, Oaktrail, Cedarview and Medfield hardware.

For the initial merge Medfield will be left out as it needs considerable
further work to reach a decent standard

Begin by adding the Makefiles and Kconfig. These are not yet plumbed into
the DRM layer so will have no effect on their own

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
drivers/gpu/drm/gma500/Kconfig [new file with mode: 0644]
drivers/gpu/drm/gma500/Makefile [new file with mode: 0644]

diff --git a/drivers/gpu/drm/gma500/Kconfig b/drivers/gpu/drm/gma500/Kconfig
new file mode 100644 (file)
index 0000000..78e46e8
--- /dev/null
@@ -0,0 +1,26 @@
+config DRM_GMA500
+       tristate "Intel GMA5/600 KMS Framebuffer"
+       depends on DRM && PCI && X86 && EXPERIMENTAL
+       select FB_CFB_COPYAREA
+        select FB_CFB_FILLRECT
+        select FB_CFB_IMAGEBLIT
+        select DRM_KMS_HELPER
+        select DRM_TTM
+       help
+         Say yes for an experimental 2D KMS framebuffer driver for the
+         Intel GMA500 ('Poulsbo') and other Intel IMG based graphics
+         devices.
+
+config DRM_GMA600
+       bool "Intel GMA600 support (Experimental)"
+       depends on DRM_GMA500
+       help
+         Say yes to include support for GMA600 (Intel Moorestown/Oaktrail)
+         platforms with LVDS ports. HDMI and MIPI are not currently
+         supported.
+
+config DRM_CEDARVIEW
+       bool "Intel Cedarview support (Experimental)"
+       depends on DRM_GMA500
+       help
+         Say yes to include support for Intel Cedarview platforms
diff --git a/drivers/gpu/drm/gma500/Makefile b/drivers/gpu/drm/gma500/Makefile
new file mode 100644 (file)
index 0000000..613c74f
--- /dev/null
@@ -0,0 +1,39 @@
+#
+#      KMS driver for the GMA500
+#
+ccflags-y += -Iinclude/drm
+
+gma500_gfx-y += gem_glue.o \
+         accel_2d.o \
+         backlight.o \
+         framebuffer.o \
+         gem.o \
+         gtt.o \
+         intel_bios.o \
+         intel_i2c.o \
+         intel_opregion.o \
+         mmu.o \
+         power.o \
+         psb_drv.o \
+         psb_intel_display.o \
+         psb_intel_lvds.o \
+         psb_intel_modes.o \
+         psb_intel_sdvo.o \
+         psb_lid.o \
+         psb_irq.o \
+         psb_device.o \
+         mid_bios.o
+
+gma500_gfx-$(CONFIG_DRM_CEDARVIEW) +=  cdv_device.o \
+         cdv_intel_crt.o \
+         cdv_intel_display.o \
+         cdv_intel_hdmi.o \
+         cdv_intel_lvds.o
+
+gma500_gfx-$(CONFIG_DRM_GMA600) += oaktrail_device.o \
+         oaktrail_crtc.o \
+         oaktrail_lvds.o \
+         oaktrail_hdmi.o \
+         oaktrail_hdmi_i2c.o
+
+obj-$(CONFIG_DRM_GMA500) += gma500_gfx.o