diff options
author | Aaro Koskinen <aaro.koskinen@iki.fi> | 2011-03-08 15:16:06 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-03-09 19:02:51 -0500 |
commit | daa484ec96349f2cad6f547517741c74395215ed (patch) | |
tree | e6ba669075b5b095138bd7fc30e989fe6020b881 | |
parent | df0d5e6055b0230763da7a8975db1a7886442d93 (diff) |
staging: xgifb: delete HW cursor memory allocation
HW cursor area is not used in any way.
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/staging/xgifb/XGI_main.h | 8 | ||||
-rw-r--r-- | drivers/staging/xgifb/XGI_main_26.c | 18 |
2 files changed, 0 insertions, 26 deletions
diff --git a/drivers/staging/xgifb/XGI_main.h b/drivers/staging/xgifb/XGI_main.h index 37f77ee459c..88d15c8394e 100644 --- a/drivers/staging/xgifb/XGI_main.h +++ b/drivers/staging/xgifb/XGI_main.h | |||
@@ -66,7 +66,6 @@ MODULE_DEVICE_TABLE(pci, xgifb_pci_table); | |||
66 | 66 | ||
67 | #define MAX_ROM_SCAN 0x10000 | 67 | #define MAX_ROM_SCAN 0x10000 |
68 | 68 | ||
69 | #define HW_CURSOR_CAP 0x80 | ||
70 | #define TURBO_QUEUE_CAP 0x40 | 69 | #define TURBO_QUEUE_CAP 0x40 |
71 | #define AGP_CMD_QUEUE_CAP 0x20 | 70 | #define AGP_CMD_QUEUE_CAP 0x20 |
72 | #define VM_CMD_QUEUE_CAP 0x10 | 71 | #define VM_CMD_QUEUE_CAP 0x10 |
@@ -80,10 +79,6 @@ MODULE_DEVICE_TABLE(pci, xgifb_pci_table); | |||
80 | #define COMMAND_QUEUE_THRESHOLD 0x1F | 79 | #define COMMAND_QUEUE_THRESHOLD 0x1F |
81 | 80 | ||
82 | 81 | ||
83 | /* TW */ | ||
84 | #define HW_CURSOR_AREA_SIZE_315 0x4000 /* 16K */ | ||
85 | #define HW_CURSOR_AREA_SIZE_300 0x1000 /* 4K */ | ||
86 | |||
87 | #define OH_ALLOC_SIZE 4000 | 82 | #define OH_ALLOC_SIZE 4000 |
88 | #define SENTINEL 0x7fffffff | 83 | #define SENTINEL 0x7fffffff |
89 | 84 | ||
@@ -350,7 +345,6 @@ static int enable_dstn = 0; | |||
350 | static int XGIfb_ypan = -1; | 345 | static int XGIfb_ypan = -1; |
351 | 346 | ||
352 | 347 | ||
353 | static int XGIfb_hwcursor_size = 0; | ||
354 | static int XGIfb_CRT2_write_enable = 0; | 348 | static int XGIfb_CRT2_write_enable = 0; |
355 | 349 | ||
356 | static int XGIfb_crt2type = -1; /* TW: CRT2 type (for overriding autodetection) */ | 350 | static int XGIfb_crt2type = -1; /* TW: CRT2 type (for overriding autodetection) */ |
@@ -613,8 +607,6 @@ typedef struct _XGI_HEAP { | |||
613 | unsigned long max_freesize; | 607 | unsigned long max_freesize; |
614 | } XGI_HEAP; | 608 | } XGI_HEAP; |
615 | 609 | ||
616 | static unsigned long XGIfb_hwcursor_vbase; | ||
617 | |||
618 | static unsigned long XGIfb_heap_start; | 610 | static unsigned long XGIfb_heap_start; |
619 | static unsigned long XGIfb_heap_end; | 611 | static unsigned long XGIfb_heap_end; |
620 | static unsigned long XGIfb_heap_size; | 612 | static unsigned long XGIfb_heap_size; |
diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c index faf7106b355..3998dd485df 100644 --- a/drivers/staging/xgifb/XGI_main_26.c +++ b/drivers/staging/xgifb/XGI_main_26.c | |||
@@ -2122,19 +2122,6 @@ static int XGIfb_heap_init(void) | |||
2122 | break; | 2122 | break; |
2123 | } | 2123 | } |
2124 | 2124 | ||
2125 | /* TW: Now reserve memory for the HWCursor. It is always located at the very | ||
2126 | top of the videoRAM, right below the TB memory area (if used). */ | ||
2127 | if (XGIfb_heap_size >= XGIfb_hwcursor_size) { | ||
2128 | XGIfb_heap_end -= XGIfb_hwcursor_size; | ||
2129 | XGIfb_heap_size -= XGIfb_hwcursor_size; | ||
2130 | XGIfb_hwcursor_vbase = XGIfb_heap_end; | ||
2131 | |||
2132 | XGIfb_caps |= HW_CURSOR_CAP; | ||
2133 | |||
2134 | DPRINTK("XGIfb: Hardware Cursor start at 0x%lx, size is %dK\n", | ||
2135 | XGIfb_heap_end, XGIfb_hwcursor_size/1024); | ||
2136 | } | ||
2137 | |||
2138 | XGIfb_heap.poha_chain = NULL; | 2125 | XGIfb_heap.poha_chain = NULL; |
2139 | XGIfb_heap.poh_freelist = NULL; | 2126 | XGIfb_heap.poh_freelist = NULL; |
2140 | 2127 | ||
@@ -2772,27 +2759,22 @@ static int __devinit xgifb_probe(struct pci_dev *pdev, | |||
2772 | xgi_video_info.chip = XG21; | 2759 | xgi_video_info.chip = XG21; |
2773 | else | 2760 | else |
2774 | xgi_video_info.chip = XG20; | 2761 | xgi_video_info.chip = XG20; |
2775 | XGIfb_hwcursor_size = HW_CURSOR_AREA_SIZE_315 * 2; | ||
2776 | XGIfb_CRT2_write_enable = IND_XGI_CRT2_WRITE_ENABLE_315; | 2762 | XGIfb_CRT2_write_enable = IND_XGI_CRT2_WRITE_ENABLE_315; |
2777 | break; | 2763 | break; |
2778 | case PCI_DEVICE_ID_XG_40: | 2764 | case PCI_DEVICE_ID_XG_40: |
2779 | xgi_video_info.chip = XG40; | 2765 | xgi_video_info.chip = XG40; |
2780 | XGIfb_hwcursor_size = HW_CURSOR_AREA_SIZE_315 * 2; | ||
2781 | XGIfb_CRT2_write_enable = IND_XGI_CRT2_WRITE_ENABLE_315; | 2766 | XGIfb_CRT2_write_enable = IND_XGI_CRT2_WRITE_ENABLE_315; |
2782 | break; | 2767 | break; |
2783 | case PCI_DEVICE_ID_XG_41: | 2768 | case PCI_DEVICE_ID_XG_41: |
2784 | xgi_video_info.chip = XG41; | 2769 | xgi_video_info.chip = XG41; |
2785 | XGIfb_hwcursor_size = HW_CURSOR_AREA_SIZE_315 * 2; | ||
2786 | XGIfb_CRT2_write_enable = IND_XGI_CRT2_WRITE_ENABLE_315; | 2770 | XGIfb_CRT2_write_enable = IND_XGI_CRT2_WRITE_ENABLE_315; |
2787 | break; | 2771 | break; |
2788 | case PCI_DEVICE_ID_XG_42: | 2772 | case PCI_DEVICE_ID_XG_42: |
2789 | xgi_video_info.chip = XG42; | 2773 | xgi_video_info.chip = XG42; |
2790 | XGIfb_hwcursor_size = HW_CURSOR_AREA_SIZE_315 * 2; | ||
2791 | XGIfb_CRT2_write_enable = IND_XGI_CRT2_WRITE_ENABLE_315; | 2774 | XGIfb_CRT2_write_enable = IND_XGI_CRT2_WRITE_ENABLE_315; |
2792 | break; | 2775 | break; |
2793 | case PCI_DEVICE_ID_XG_27: | 2776 | case PCI_DEVICE_ID_XG_27: |
2794 | xgi_video_info.chip = XG27; | 2777 | xgi_video_info.chip = XG27; |
2795 | XGIfb_hwcursor_size = HW_CURSOR_AREA_SIZE_315 * 2; | ||
2796 | XGIfb_CRT2_write_enable = IND_XGI_CRT2_WRITE_ENABLE_315; | 2778 | XGIfb_CRT2_write_enable = IND_XGI_CRT2_WRITE_ENABLE_315; |
2797 | break; | 2779 | break; |
2798 | default: | 2780 | default: |