diff options
author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
---|---|---|
committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/gpu/drm/savage | |
parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/gpu/drm/savage')
-rw-r--r-- | drivers/gpu/drm/savage/savage_bci.c | 3 | ||||
-rw-r--r-- | drivers/gpu/drm/savage/savage_drv.c | 17 |
2 files changed, 8 insertions, 12 deletions
diff --git a/drivers/gpu/drm/savage/savage_bci.c b/drivers/gpu/drm/savage/savage_bci.c index bf5f83ea14fe..cb1ee4e0050a 100644 --- a/drivers/gpu/drm/savage/savage_bci.c +++ b/drivers/gpu/drm/savage/savage_bci.c | |||
@@ -647,9 +647,6 @@ int savage_driver_firstopen(struct drm_device *dev) | |||
647 | ret = drm_addmap(dev, aperture_base, SAVAGE_APERTURE_SIZE, | 647 | ret = drm_addmap(dev, aperture_base, SAVAGE_APERTURE_SIZE, |
648 | _DRM_FRAME_BUFFER, _DRM_WRITE_COMBINING, | 648 | _DRM_FRAME_BUFFER, _DRM_WRITE_COMBINING, |
649 | &dev_priv->aperture); | 649 | &dev_priv->aperture); |
650 | if (ret) | ||
651 | return ret; | ||
652 | |||
653 | return ret; | 650 | return ret; |
654 | } | 651 | } |
655 | 652 | ||
diff --git a/drivers/gpu/drm/savage/savage_drv.c b/drivers/gpu/drm/savage/savage_drv.c index 021de44c15ab..6464490b240b 100644 --- a/drivers/gpu/drm/savage/savage_drv.c +++ b/drivers/gpu/drm/savage/savage_drv.c | |||
@@ -42,8 +42,6 @@ static struct drm_driver driver = { | |||
42 | .lastclose = savage_driver_lastclose, | 42 | .lastclose = savage_driver_lastclose, |
43 | .unload = savage_driver_unload, | 43 | .unload = savage_driver_unload, |
44 | .reclaim_buffers = savage_reclaim_buffers, | 44 | .reclaim_buffers = savage_reclaim_buffers, |
45 | .get_map_ofs = drm_core_get_map_ofs, | ||
46 | .get_reg_ofs = drm_core_get_reg_ofs, | ||
47 | .ioctls = savage_ioctls, | 45 | .ioctls = savage_ioctls, |
48 | .dma_ioctl = savage_bci_buffers, | 46 | .dma_ioctl = savage_bci_buffers, |
49 | .fops = { | 47 | .fops = { |
@@ -54,11 +52,7 @@ static struct drm_driver driver = { | |||
54 | .mmap = drm_mmap, | 52 | .mmap = drm_mmap, |
55 | .poll = drm_poll, | 53 | .poll = drm_poll, |
56 | .fasync = drm_fasync, | 54 | .fasync = drm_fasync, |
57 | }, | 55 | .llseek = noop_llseek, |
58 | |||
59 | .pci_driver = { | ||
60 | .name = DRIVER_NAME, | ||
61 | .id_table = pciidlist, | ||
62 | }, | 56 | }, |
63 | 57 | ||
64 | .name = DRIVER_NAME, | 58 | .name = DRIVER_NAME, |
@@ -69,15 +63,20 @@ static struct drm_driver driver = { | |||
69 | .patchlevel = DRIVER_PATCHLEVEL, | 63 | .patchlevel = DRIVER_PATCHLEVEL, |
70 | }; | 64 | }; |
71 | 65 | ||
66 | static struct pci_driver savage_pci_driver = { | ||
67 | .name = DRIVER_NAME, | ||
68 | .id_table = pciidlist, | ||
69 | }; | ||
70 | |||
72 | static int __init savage_init(void) | 71 | static int __init savage_init(void) |
73 | { | 72 | { |
74 | driver.num_ioctls = savage_max_ioctl; | 73 | driver.num_ioctls = savage_max_ioctl; |
75 | return drm_init(&driver); | 74 | return drm_pci_init(&driver, &savage_pci_driver); |
76 | } | 75 | } |
77 | 76 | ||
78 | static void __exit savage_exit(void) | 77 | static void __exit savage_exit(void) |
79 | { | 78 | { |
80 | drm_exit(&driver); | 79 | drm_pci_exit(&driver, &savage_pci_driver); |
81 | } | 80 | } |
82 | 81 | ||
83 | module_init(savage_init); | 82 | module_init(savage_init); |