aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/drm/i915_drv.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/char/drm/i915_drv.c')
-rw-r--r--drivers/char/drm/i915_drv.c61
1 files changed, 30 insertions, 31 deletions
diff --git a/drivers/char/drm/i915_drv.c b/drivers/char/drm/i915_drv.c
index 106b9ec02213..665da6ac11c6 100644
--- a/drivers/char/drm/i915_drv.c
+++ b/drivers/char/drm/i915_drv.c
@@ -34,36 +34,34 @@
34 34
35#include "drm_pciids.h" 35#include "drm_pciids.h"
36 36
37static int postinit( struct drm_device *dev, unsigned long flags ) 37static int postinit(struct drm_device *dev, unsigned long flags)
38{ 38{
39 dev->counters += 4; 39 dev->counters += 4;
40 dev->types[6] = _DRM_STAT_IRQ; 40 dev->types[6] = _DRM_STAT_IRQ;
41 dev->types[7] = _DRM_STAT_PRIMARY; 41 dev->types[7] = _DRM_STAT_PRIMARY;
42 dev->types[8] = _DRM_STAT_SECONDARY; 42 dev->types[8] = _DRM_STAT_SECONDARY;
43 dev->types[9] = _DRM_STAT_DMA; 43 dev->types[9] = _DRM_STAT_DMA;
44 44
45 DRM_INFO( "Initialized %s %d.%d.%d %s on minor %d: %s\n", 45 DRM_INFO("Initialized %s %d.%d.%d %s on minor %d: %s\n",
46 DRIVER_NAME, 46 DRIVER_NAME,
47 DRIVER_MAJOR, 47 DRIVER_MAJOR,
48 DRIVER_MINOR, 48 DRIVER_MINOR,
49 DRIVER_PATCHLEVEL, 49 DRIVER_PATCHLEVEL,
50 DRIVER_DATE, 50 DRIVER_DATE, dev->primary.minor, pci_pretty_name(dev->pdev)
51 dev->primary.minor, 51 );
52 pci_pretty_name(dev->pdev)
53 );
54 return 0; 52 return 0;
55} 53}
56 54
57static int version( drm_version_t *version ) 55static int version(drm_version_t * version)
58{ 56{
59 int len; 57 int len;
60 58
61 version->version_major = DRIVER_MAJOR; 59 version->version_major = DRIVER_MAJOR;
62 version->version_minor = DRIVER_MINOR; 60 version->version_minor = DRIVER_MINOR;
63 version->version_patchlevel = DRIVER_PATCHLEVEL; 61 version->version_patchlevel = DRIVER_PATCHLEVEL;
64 DRM_COPY( version->name, DRIVER_NAME ); 62 DRM_COPY(version->name, DRIVER_NAME);
65 DRM_COPY( version->date, DRIVER_DATE ); 63 DRM_COPY(version->date, DRIVER_DATE);
66 DRM_COPY( version->desc, DRIVER_DESC ); 64 DRM_COPY(version->desc, DRIVER_DESC);
67 return 0; 65 return 0;
68} 66}
69 67
@@ -75,8 +73,9 @@ extern drm_ioctl_desc_t i915_ioctls[];
75extern int i915_max_ioctl; 73extern int i915_max_ioctl;
76 74
77static struct drm_driver driver = { 75static struct drm_driver driver = {
78 .driver_features = DRIVER_USE_AGP | DRIVER_REQUIRE_AGP | DRIVER_USE_MTRR | 76 .driver_features =
79 DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED, 77 DRIVER_USE_AGP | DRIVER_REQUIRE_AGP | DRIVER_USE_MTRR |
78 DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED,
80 .pretakedown = i915_driver_pretakedown, 79 .pretakedown = i915_driver_pretakedown,
81 .prerelease = i915_driver_prerelease, 80 .prerelease = i915_driver_prerelease,
82 .device_is_agp = i915_driver_device_is_agp, 81 .device_is_agp = i915_driver_device_is_agp,
@@ -91,21 +90,21 @@ static struct drm_driver driver = {
91 .version = version, 90 .version = version,
92 .ioctls = i915_ioctls, 91 .ioctls = i915_ioctls,
93 .fops = { 92 .fops = {
94 .owner = THIS_MODULE, 93 .owner = THIS_MODULE,
95 .open = drm_open, 94 .open = drm_open,
96 .release = drm_release, 95 .release = drm_release,
97 .ioctl = drm_ioctl, 96 .ioctl = drm_ioctl,
98 .mmap = drm_mmap, 97 .mmap = drm_mmap,
99 .poll = drm_poll, 98 .poll = drm_poll,
100 .fasync = drm_fasync, 99 .fasync = drm_fasync,
101#ifdef CONFIG_COMPAT 100#ifdef CONFIG_COMPAT
102 .compat_ioctl = i915_compat_ioctl, 101 .compat_ioctl = i915_compat_ioctl,
103#endif 102#endif
104 }, 103 },
105 .pci_driver = { 104 .pci_driver = {
106 .name = DRIVER_NAME, 105 .name = DRIVER_NAME,
107 .id_table = pciidlist, 106 .id_table = pciidlist,
108 } 107 }
109}; 108};
110 109
111static int __init i915_init(void) 110static int __init i915_init(void)
@@ -122,6 +121,6 @@ static void __exit i915_exit(void)
122module_init(i915_init); 121module_init(i915_init);
123module_exit(i915_exit); 122module_exit(i915_exit);
124 123
125MODULE_AUTHOR( DRIVER_AUTHOR ); 124MODULE_AUTHOR(DRIVER_AUTHOR);
126MODULE_DESCRIPTION( DRIVER_DESC ); 125MODULE_DESCRIPTION(DRIVER_DESC);
127MODULE_LICENSE("GPL and additional rights"); 126MODULE_LICENSE("GPL and additional rights");