diff options
Diffstat (limited to 'drivers/video')
-rw-r--r-- | drivers/video/aty/radeon_pm.c | 2 | ||||
-rw-r--r-- | drivers/video/cyblafb.c | 2 | ||||
-rw-r--r-- | drivers/video/intelfb/intelfb.h | 2 | ||||
-rw-r--r-- | drivers/video/omap/lcdc.c | 2 | ||||
-rw-r--r-- | drivers/video/sis/sis.h | 8 | ||||
-rw-r--r-- | drivers/video/sis/sis_main.c | 48 | ||||
-rw-r--r-- | drivers/video/sm501fb.c | 2 |
7 files changed, 5 insertions, 61 deletions
diff --git a/drivers/video/aty/radeon_pm.c b/drivers/video/aty/radeon_pm.c index 83ee3e75386c..675abdafc2d8 100644 --- a/drivers/video/aty/radeon_pm.c +++ b/drivers/video/aty/radeon_pm.c | |||
@@ -2561,7 +2561,7 @@ static void radeon_set_suspend(struct radeonfb_info *rinfo, int suspend) | |||
2561 | pci_read_config_dword(rinfo->pdev, i * 4, | 2561 | pci_read_config_dword(rinfo->pdev, i * 4, |
2562 | &rinfo->cfg_save[i]); | 2562 | &rinfo->cfg_save[i]); |
2563 | 2563 | ||
2564 | /* Switch PCI power managment to D2. */ | 2564 | /* Switch PCI power management to D2. */ |
2565 | pci_disable_device(rinfo->pdev); | 2565 | pci_disable_device(rinfo->pdev); |
2566 | for (;;) { | 2566 | for (;;) { |
2567 | pci_read_config_word( | 2567 | pci_read_config_word( |
diff --git a/drivers/video/cyblafb.c b/drivers/video/cyblafb.c index e23324d10be2..9704b73135f5 100644 --- a/drivers/video/cyblafb.c +++ b/drivers/video/cyblafb.c | |||
@@ -1156,7 +1156,7 @@ static struct fb_ops cyblafb_ops __devinitdata = { | |||
1156 | // need altered timings to display correctly. So I decided that it is much | 1156 | // need altered timings to display correctly. So I decided that it is much |
1157 | // better to provide a limited optimized set of modes plus the option of | 1157 | // better to provide a limited optimized set of modes plus the option of |
1158 | // using the mode in effect at startup time (might be selected using the | 1158 | // using the mode in effect at startup time (might be selected using the |
1159 | // vga=??? paramter). After that the user might use fbset to select any | 1159 | // vga=??? parameter). After that the user might use fbset to select any |
1160 | // mode he likes, check_var will not try to alter geometry parameters as | 1160 | // mode he likes, check_var will not try to alter geometry parameters as |
1161 | // it would be necessary otherwise. | 1161 | // it would be necessary otherwise. |
1162 | // | 1162 | // |
diff --git a/drivers/video/intelfb/intelfb.h b/drivers/video/intelfb/intelfb.h index 2fe3f7def530..836796177942 100644 --- a/drivers/video/intelfb/intelfb.h +++ b/drivers/video/intelfb/intelfb.h | |||
@@ -111,7 +111,7 @@ | |||
111 | 111 | ||
112 | #define FIXED_MODE(d) ((d)->fixed_mode) | 112 | #define FIXED_MODE(d) ((d)->fixed_mode) |
113 | 113 | ||
114 | /*** Driver paramters ***/ | 114 | /*** Driver parameters ***/ |
115 | 115 | ||
116 | #define RINGBUFFER_SIZE KB(64) | 116 | #define RINGBUFFER_SIZE KB(64) |
117 | #define HW_CURSOR_SIZE KB(4) | 117 | #define HW_CURSOR_SIZE KB(4) |
diff --git a/drivers/video/omap/lcdc.c b/drivers/video/omap/lcdc.c index 9085188d815e..fb19ed4992db 100644 --- a/drivers/video/omap/lcdc.c +++ b/drivers/video/omap/lcdc.c | |||
@@ -312,7 +312,7 @@ static irqreturn_t lcdc_irq_handler(int irq, void *dev_id) | |||
312 | /* | 312 | /* |
313 | * Change to a new video mode. We defer this to a later time to avoid any | 313 | * Change to a new video mode. We defer this to a later time to avoid any |
314 | * flicker and not to mess up the current LCD DMA context. For this we disable | 314 | * flicker and not to mess up the current LCD DMA context. For this we disable |
315 | * the LCD controler, which will generate a DONE irq after the last frame has | 315 | * the LCD controller, which will generate a DONE irq after the last frame has |
316 | * been transferred. Then it'll be safe to reconfigure both the LCD controller | 316 | * been transferred. Then it'll be safe to reconfigure both the LCD controller |
317 | * as well as the LCD DMA. | 317 | * as well as the LCD DMA. |
318 | */ | 318 | */ |
diff --git a/drivers/video/sis/sis.h b/drivers/video/sis/sis.h index d53bf6945f0c..9b05da6268f7 100644 --- a/drivers/video/sis/sis.h +++ b/drivers/video/sis/sis.h | |||
@@ -39,12 +39,7 @@ | |||
39 | #include <linux/spinlock.h> | 39 | #include <linux/spinlock.h> |
40 | 40 | ||
41 | #ifdef CONFIG_COMPAT | 41 | #ifdef CONFIG_COMPAT |
42 | #if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,10) | ||
43 | #include <linux/ioctl32.h> | ||
44 | #define SIS_OLD_CONFIG_COMPAT | ||
45 | #else | ||
46 | #define SIS_NEW_CONFIG_COMPAT | 42 | #define SIS_NEW_CONFIG_COMPAT |
47 | #endif | ||
48 | #endif /* CONFIG_COMPAT */ | 43 | #endif /* CONFIG_COMPAT */ |
49 | 44 | ||
50 | #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,8) | 45 | #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,8) |
@@ -607,9 +602,6 @@ struct sis_video_info { | |||
607 | int haveXGIROM; | 602 | int haveXGIROM; |
608 | int registered; | 603 | int registered; |
609 | int warncount; | 604 | int warncount; |
610 | #ifdef SIS_OLD_CONFIG_COMPAT | ||
611 | int ioctl32registered; | ||
612 | #endif | ||
613 | 605 | ||
614 | int sisvga_engine; | 606 | int sisvga_engine; |
615 | int hwcursor_size; | 607 | int hwcursor_size; |
diff --git a/drivers/video/sis/sis_main.c b/drivers/video/sis/sis_main.c index 37bd24b8d83b..93ae747440cb 100644 --- a/drivers/video/sis/sis_main.c +++ b/drivers/video/sis/sis_main.c | |||
@@ -5805,9 +5805,6 @@ sisfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
5805 | ivideo->pcifunc = PCI_FUNC(pdev->devfn); | 5805 | ivideo->pcifunc = PCI_FUNC(pdev->devfn); |
5806 | ivideo->subsysvendor = pdev->subsystem_vendor; | 5806 | ivideo->subsysvendor = pdev->subsystem_vendor; |
5807 | ivideo->subsysdevice = pdev->subsystem_device; | 5807 | ivideo->subsysdevice = pdev->subsystem_device; |
5808 | #ifdef SIS_OLD_CONFIG_COMPAT | ||
5809 | ivideo->ioctl32registered = 0; | ||
5810 | #endif | ||
5811 | 5808 | ||
5812 | #ifndef MODULE | 5809 | #ifndef MODULE |
5813 | if(sisfb_mode_idx == -1) { | 5810 | if(sisfb_mode_idx == -1) { |
@@ -6420,30 +6417,6 @@ error_3: vfree(ivideo->bios_abase); | |||
6420 | ivideo->next = card_list; | 6417 | ivideo->next = card_list; |
6421 | card_list = ivideo; | 6418 | card_list = ivideo; |
6422 | 6419 | ||
6423 | #ifdef SIS_OLD_CONFIG_COMPAT | ||
6424 | { | ||
6425 | int ret; | ||
6426 | /* Our ioctls are all "32/64bit compatible" */ | ||
6427 | ret = register_ioctl32_conversion(FBIO_ALLOC, NULL); | ||
6428 | ret |= register_ioctl32_conversion(FBIO_FREE, NULL); | ||
6429 | ret |= register_ioctl32_conversion(FBIOGET_VBLANK, NULL); | ||
6430 | ret |= register_ioctl32_conversion(SISFB_GET_INFO_SIZE, NULL); | ||
6431 | ret |= register_ioctl32_conversion(SISFB_GET_INFO, NULL); | ||
6432 | ret |= register_ioctl32_conversion(SISFB_GET_TVPOSOFFSET, NULL); | ||
6433 | ret |= register_ioctl32_conversion(SISFB_SET_TVPOSOFFSET, NULL); | ||
6434 | ret |= register_ioctl32_conversion(SISFB_SET_LOCK, NULL); | ||
6435 | ret |= register_ioctl32_conversion(SISFB_GET_VBRSTATUS, NULL); | ||
6436 | ret |= register_ioctl32_conversion(SISFB_GET_AUTOMAXIMIZE, NULL); | ||
6437 | ret |= register_ioctl32_conversion(SISFB_SET_AUTOMAXIMIZE, NULL); | ||
6438 | ret |= register_ioctl32_conversion(SISFB_COMMAND, NULL); | ||
6439 | if(ret) | ||
6440 | printk(KERN_ERR | ||
6441 | "sisfb: Error registering ioctl32 translations\n"); | ||
6442 | else | ||
6443 | ivideo->ioctl32registered = 1; | ||
6444 | } | ||
6445 | #endif | ||
6446 | |||
6447 | printk(KERN_INFO "sisfb: 2D acceleration is %s, y-panning %s\n", | 6420 | printk(KERN_INFO "sisfb: 2D acceleration is %s, y-panning %s\n", |
6448 | ivideo->sisfb_accel ? "enabled" : "disabled", | 6421 | ivideo->sisfb_accel ? "enabled" : "disabled", |
6449 | ivideo->sisfb_ypan ? | 6422 | ivideo->sisfb_ypan ? |
@@ -6473,27 +6446,6 @@ static void __devexit sisfb_remove(struct pci_dev *pdev) | |||
6473 | int registered = ivideo->registered; | 6446 | int registered = ivideo->registered; |
6474 | int modechanged = ivideo->modechanged; | 6447 | int modechanged = ivideo->modechanged; |
6475 | 6448 | ||
6476 | #ifdef SIS_OLD_CONFIG_COMPAT | ||
6477 | if(ivideo->ioctl32registered) { | ||
6478 | int ret; | ||
6479 | ret = unregister_ioctl32_conversion(FBIO_ALLOC); | ||
6480 | ret |= unregister_ioctl32_conversion(FBIO_FREE); | ||
6481 | ret |= unregister_ioctl32_conversion(FBIOGET_VBLANK); | ||
6482 | ret |= unregister_ioctl32_conversion(SISFB_GET_INFO_SIZE); | ||
6483 | ret |= unregister_ioctl32_conversion(SISFB_GET_INFO); | ||
6484 | ret |= unregister_ioctl32_conversion(SISFB_GET_TVPOSOFFSET); | ||
6485 | ret |= unregister_ioctl32_conversion(SISFB_SET_TVPOSOFFSET); | ||
6486 | ret |= unregister_ioctl32_conversion(SISFB_SET_LOCK); | ||
6487 | ret |= unregister_ioctl32_conversion(SISFB_GET_VBRSTATUS); | ||
6488 | ret |= unregister_ioctl32_conversion(SISFB_GET_AUTOMAXIMIZE); | ||
6489 | ret |= unregister_ioctl32_conversion(SISFB_SET_AUTOMAXIMIZE); | ||
6490 | ret |= unregister_ioctl32_conversion(SISFB_COMMAND); | ||
6491 | if(ret) | ||
6492 | printk(KERN_ERR | ||
6493 | "sisfb: Error unregistering ioctl32 translations\n"); | ||
6494 | } | ||
6495 | #endif | ||
6496 | |||
6497 | /* Unmap */ | 6449 | /* Unmap */ |
6498 | iounmap(ivideo->mmio_vbase); | 6450 | iounmap(ivideo->mmio_vbase); |
6499 | iounmap(ivideo->video_vbase); | 6451 | iounmap(ivideo->video_vbase); |
diff --git a/drivers/video/sm501fb.c b/drivers/video/sm501fb.c index 1be95a68d696..58f200c69be3 100644 --- a/drivers/video/sm501fb.c +++ b/drivers/video/sm501fb.c | |||
@@ -48,7 +48,7 @@ enum sm501_controller { | |||
48 | HEAD_PANEL = 1, | 48 | HEAD_PANEL = 1, |
49 | }; | 49 | }; |
50 | 50 | ||
51 | /* SM501 memory adress */ | 51 | /* SM501 memory address */ |
52 | struct sm501_mem { | 52 | struct sm501_mem { |
53 | unsigned long size; | 53 | unsigned long size; |
54 | unsigned long sm_addr; | 54 | unsigned long sm_addr; |