diff options
author | Alan Cox <alan@linux.intel.com> | 2011-12-29 09:38:07 -0500 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2012-01-03 04:30:29 -0500 |
commit | f9f23a77f07506a32d9dc1d925bf85c0e7507b66 (patch) | |
tree | aac21c5054970d2c8f7b58539f28a6c5fc3b8bb9 /drivers/gpu/drm/gma500 | |
parent | b6195aab9ca63a4f6911365f36eb091666fcb15a (diff) |
gma500: remove no_fb bits
This doesn't work and isn't of any use. It was inherited from the older
driver code and can go away. Kill it off before it becomes part of mainstream
as we don't want to support it in future.
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/gma500')
-rw-r--r-- | drivers/gpu/drm/gma500/psb_drv.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/drivers/gpu/drm/gma500/psb_drv.c b/drivers/gpu/drm/gma500/psb_drv.c index 96756ccaa07c..f14768f2b364 100644 --- a/drivers/gpu/drm/gma500/psb_drv.c +++ b/drivers/gpu/drm/gma500/psb_drv.c | |||
@@ -39,13 +39,9 @@ | |||
39 | 39 | ||
40 | static int drm_psb_trap_pagefaults; | 40 | static int drm_psb_trap_pagefaults; |
41 | 41 | ||
42 | int drm_psb_no_fb; | ||
43 | |||
44 | static int psb_probe(struct pci_dev *pdev, const struct pci_device_id *ent); | 42 | static int psb_probe(struct pci_dev *pdev, const struct pci_device_id *ent); |
45 | 43 | ||
46 | MODULE_PARM_DESC(no_fb, "Disable FBdev"); | ||
47 | MODULE_PARM_DESC(trap_pagefaults, "Error and reset on MMU pagefaults"); | 44 | MODULE_PARM_DESC(trap_pagefaults, "Error and reset on MMU pagefaults"); |
48 | module_param_named(no_fb, drm_psb_no_fb, int, 0600); | ||
49 | module_param_named(trap_pagefaults, drm_psb_trap_pagefaults, int, 0600); | 45 | module_param_named(trap_pagefaults, drm_psb_trap_pagefaults, int, 0600); |
50 | 46 | ||
51 | 47 | ||
@@ -213,8 +209,7 @@ static int psb_driver_unload(struct drm_device *dev) | |||
213 | 209 | ||
214 | gma_backlight_exit(dev); | 210 | gma_backlight_exit(dev); |
215 | 211 | ||
216 | if (drm_psb_no_fb == 0) | 212 | psb_modeset_cleanup(dev); |
217 | psb_modeset_cleanup(dev); | ||
218 | 213 | ||
219 | if (dev_priv) { | 214 | if (dev_priv) { |
220 | psb_lid_timer_takedown(dev_priv); | 215 | psb_lid_timer_takedown(dev_priv); |
@@ -383,11 +378,9 @@ static int psb_driver_load(struct drm_device *dev, unsigned long chipset) | |||
383 | 378 | ||
384 | dev->driver->get_vblank_counter = psb_get_vblank_counter; | 379 | dev->driver->get_vblank_counter = psb_get_vblank_counter; |
385 | 380 | ||
386 | if (drm_psb_no_fb == 0) { | 381 | psb_modeset_init(dev); |
387 | psb_modeset_init(dev); | 382 | psb_fbdev_init(dev); |
388 | psb_fbdev_init(dev); | 383 | drm_kms_helper_poll_init(dev); |
389 | drm_kms_helper_poll_init(dev); | ||
390 | } | ||
391 | 384 | ||
392 | /* Only add backlight support if we have LVDS output */ | 385 | /* Only add backlight support if we have LVDS output */ |
393 | list_for_each_entry(connector, &dev->mode_config.connector_list, | 386 | list_for_each_entry(connector, &dev->mode_config.connector_list, |