diff options
| author | Matt Turner <mattst88@gmail.com> | 2010-06-01 19:50:57 -0400 |
|---|---|---|
| committer | Matt Turner <mattst88@gmail.com> | 2010-06-29 15:26:32 -0400 |
| commit | beb6db90825a65e443deae61b7683dd4278cb46c (patch) | |
| tree | 03838cc707835e2fadb86e4c18ee2449a32d9721 | |
| parent | 984bc9601f64fd341b8573021d7c999f1f1499a9 (diff) | |
| download | glint-beb6db90825a65e443deae61b7683dd4278cb46c.tar.gz | |
drm/glint: initial commit.
Signed-off-by: Matt Turner <mattst88@gmail.com>
| -rw-r--r-- | drivers/gpu/drm/Kconfig | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/Makefile | 1 | ||||
| -rw-r--r-- | drivers/gpu/drm/glint/Makefile | 8 | ||||
| -rw-r--r-- | drivers/gpu/drm/glint/glint_drv.c | 24 | ||||
| -rw-r--r-- | drivers/gpu/drm/glint/glint_drv.h | 10 |
5 files changed, 47 insertions, 0 deletions
diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig index 88910e5a2c772..87e33ea4e0b66 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig @@ -128,6 +128,10 @@ config DRM_I915_KMS endchoice +config DRM_GLINT + tristate "Permedia (GLint) 3/4 driver" + depends on DRM && AGP + config DRM_MGA tristate "Matrox g200/g400" depends on DRM diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile index abe3f446ca48e..b27096b4d4ad3 100644 --- a/drivers/gpu/drm/Makefile +++ b/drivers/gpu/drm/Makefile @@ -28,6 +28,7 @@ obj-$(CONFIG_DRM_MGA) += mga/ obj-$(CONFIG_DRM_I810) += i810/ obj-$(CONFIG_DRM_I830) += i830/ obj-$(CONFIG_DRM_I915) += i915/ +obj-$(CONFIG_DRM_GLINT) += glint/ obj-$(CONFIG_DRM_SIS) += sis/ obj-$(CONFIG_DRM_SAVAGE)+= savage/ obj-$(CONFIG_DRM_VMWGFX)+= vmwgfx/ diff --git a/drivers/gpu/drm/glint/Makefile b/drivers/gpu/drm/glint/Makefile new file mode 100644 index 0000000000000..19fa7aeee42c0 --- /dev/null +++ b/drivers/gpu/drm/glint/Makefile @@ -0,0 +1,8 @@ +# +# Makefile for the drm device driver. This driver provides support for the +# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher. + +ccflags-y := -Iinclude/drm +glint-y := glint_drv.o + +obj-$(CONFIG_DRM_GLINT) += glint.o diff --git a/drivers/gpu/drm/glint/glint_drv.c b/drivers/gpu/drm/glint/glint_drv.c new file mode 100644 index 0000000000000..6ad38b948dc4e --- /dev/null +++ b/drivers/gpu/drm/glint/glint_drv.c @@ -0,0 +1,24 @@ +#include "drmP.h" +#include "drm.h" + +#include "glint_drv.h" + +static int __init +glint_init(void) +{ + printk(KERN_INFO "Hello, GLint\n"); + return 0; +} + +static void __exit +glint_exit(void) +{ + printk(KERN_INFO "Bye, GLint\n"); +} + +module_init(glint_init); +module_exit(glint_exit); + +MODULE_AUTHOR(DRIVER_AUTHOR); +MODULE_DESCRIPTION(DRIVER_DESC); +MODULE_LICENSE("Dual MIT/GPL"); diff --git a/drivers/gpu/drm/glint/glint_drv.h b/drivers/gpu/drm/glint/glint_drv.h new file mode 100644 index 0000000000000..324f34f460c00 --- /dev/null +++ b/drivers/gpu/drm/glint/glint_drv.h @@ -0,0 +1,10 @@ +#ifndef __GLINT_DRV_H__ +#define __GLINT_DRV_H__ + +#define DRIVER_AUTHOR "Matt Turner" + +#define DRIVER_NAME "glint" +#define DRIVER_DESC "3DLabs GLint" +#define DRIVER_DATE "20100526" + +#endif /* __GLINT_DRV_H__ */ |