| d3fa996e |
1 | diff -urNp --exclude-from=/home/mitica/quintela/config/misc/dontdiff 2.4.19-rc3/drivers/video/radeonfb.c test/drivers/video/radeonfb.c |
| 2 | --- 2.4.19-rc3/drivers/video/radeonfb.c 2002-07-22 18:43:34.000000000 +0200 |
| 3 | +++ test/drivers/video/radeonfb.c 2002-07-22 18:48:09.000000000 +0200 |
| 4 | @@ -599,11 +599,6 @@ static int panel_yres __initdata = 0; |
| 5 | static char force_dfp __initdata = 0; |
| 6 | static struct radeonfb_info *board_list = NULL; |
| 7 | |
| 8 | -#ifdef FBCON_HAS_CFB8 |
| 9 | -static struct display_switch fbcon_radeon8; |
| 10 | -#endif |
| 11 | - |
| 12 | - |
| 13 | /* |
| 14 | * prototypes |
| 15 | */ |
| 16 | @@ -2948,89 +2943,3 @@ int radeon_sleep_notify(struct pmu_sleep |
| 17 | |
| 18 | #endif /* CONFIG_PMAC_PBOOK */ |
| 19 | |
| 20 | -/* |
| 21 | - * text console acceleration |
| 22 | - */ |
| 23 | - |
| 24 | - |
| 25 | -static void fbcon_radeon_bmove(struct display *p, int srcy, int srcx, |
| 26 | - int dsty, int dstx, int height, int width) |
| 27 | -{ |
| 28 | - struct radeonfb_info *rinfo = (struct radeonfb_info *)(p->fb_info); |
| 29 | - u32 dp_cntl = DST_LAST_PEL; |
| 30 | - |
| 31 | - srcx *= fontwidth(p); |
| 32 | - srcy *= fontheight(p); |
| 33 | - dstx *= fontwidth(p); |
| 34 | - dsty *= fontheight(p); |
| 35 | - width *= fontwidth(p); |
| 36 | - height *= fontheight(p); |
| 37 | - |
| 38 | - if (srcy < dsty) { |
| 39 | - srcy += height - 1; |
| 40 | - dsty += height - 1; |
| 41 | - } else |
| 42 | - dp_cntl |= DST_Y_TOP_TO_BOTTOM; |
| 43 | - |
| 44 | - if (srcx < dstx) { |
| 45 | - srcx += width - 1; |
| 46 | - dstx += width - 1; |
| 47 | - } else |
| 48 | - dp_cntl |= DST_X_LEFT_TO_RIGHT; |
| 49 | - |
| 50 | - radeon_fifo_wait(6); |
| 51 | - OUTREG(DP_GUI_MASTER_CNTL, (rinfo->dp_gui_master_cntl | |
| 52 | - GMC_BRUSH_NONE | |
| 53 | - GMC_SRC_DATATYPE_COLOR | |
| 54 | - ROP3_S | |
| 55 | - DP_SRC_SOURCE_MEMORY)); |
| 56 | - OUTREG(DP_WRITE_MSK, 0xffffffff); |
| 57 | - OUTREG(DP_CNTL, dp_cntl); |
| 58 | - OUTREG(SRC_Y_X, (srcy << 16) | srcx); |
| 59 | - OUTREG(DST_Y_X, (dsty << 16) | dstx); |
| 60 | - OUTREG(DST_HEIGHT_WIDTH, (height << 16) | width); |
| 61 | -} |
| 62 | - |
| 63 | - |
| 64 | - |
| 65 | -static void fbcon_radeon_clear(struct vc_data *conp, struct display *p, |
| 66 | - int srcy, int srcx, int height, int width) |
| 67 | -{ |
| 68 | - struct radeonfb_info *rinfo = (struct radeonfb_info *)(p->fb_info); |
| 69 | - u32 clr; |
| 70 | - |
| 71 | - clr = attr_bgcol_ec(p, conp); |
| 72 | - clr |= (clr << 8); |
| 73 | - clr |= (clr << 16); |
| 74 | - |
| 75 | - srcx *= fontwidth(p); |
| 76 | - srcy *= fontheight(p); |
| 77 | - width *= fontwidth(p); |
| 78 | - height *= fontheight(p); |
| 79 | - |
| 80 | - radeon_fifo_wait(6); |
| 81 | - OUTREG(DP_GUI_MASTER_CNTL, (rinfo->dp_gui_master_cntl | |
| 82 | - GMC_BRUSH_SOLID_COLOR | |
| 83 | - GMC_SRC_DATATYPE_COLOR | |
| 84 | - ROP3_P)); |
| 85 | - OUTREG(DP_BRUSH_FRGD_CLR, clr); |
| 86 | - OUTREG(DP_WRITE_MSK, 0xffffffff); |
| 87 | - OUTREG(DP_CNTL, (DST_X_LEFT_TO_RIGHT | DST_Y_TOP_TO_BOTTOM)); |
| 88 | - OUTREG(DST_Y_X, (srcy << 16) | srcx); |
| 89 | - OUTREG(DST_WIDTH_HEIGHT, (width << 16) | height); |
| 90 | -} |
| 91 | - |
| 92 | - |
| 93 | - |
| 94 | -#ifdef FBCON_HAS_CFB8 |
| 95 | -static struct display_switch fbcon_radeon8 = { |
| 96 | - setup: fbcon_cfb8_setup, |
| 97 | - bmove: fbcon_radeon_bmove, |
| 98 | - clear: fbcon_radeon_clear, |
| 99 | - putc: fbcon_cfb8_putc, |
| 100 | - putcs: fbcon_cfb8_putcs, |
| 101 | - revc: fbcon_cfb8_revc, |
| 102 | - clear_margins: fbcon_cfb8_clear_margins, |
| 103 | - fontwidthmask: FONTWIDTH(4)|FONTWIDTH(8)|FONTWIDTH(12)|FONTWIDTH(16) |
| 104 | -}; |
| 105 | -#endif |
projects / packages / kernel.git / blame