diff options
Diffstat (limited to 'drivers/video/tdfxfb.c')
-rw-r--r-- | drivers/video/tdfxfb.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/video/tdfxfb.c b/drivers/video/tdfxfb.c index 3ee5e63cfa4f..a99b994c9b6b 100644 --- a/drivers/video/tdfxfb.c +++ b/drivers/video/tdfxfb.c | |||
@@ -877,12 +877,12 @@ static void tdfxfb_fillrect(struct fb_info *info, | |||
877 | else | 877 | else |
878 | tdfx_rop = TDFX_ROP_XOR; | 878 | tdfx_rop = TDFX_ROP_XOR; |
879 | 879 | ||
880 | /* asume always rect->height < 4096 */ | 880 | /* assume always rect->height < 4096 */ |
881 | if (dy + rect->height > 4095) { | 881 | if (dy + rect->height > 4095) { |
882 | dstbase = stride * dy; | 882 | dstbase = stride * dy; |
883 | dy = 0; | 883 | dy = 0; |
884 | } | 884 | } |
885 | /* asume always rect->width < 4096 */ | 885 | /* assume always rect->width < 4096 */ |
886 | if (dx + rect->width > 4095) { | 886 | if (dx + rect->width > 4095) { |
887 | dstbase += dx * bpp >> 3; | 887 | dstbase += dx * bpp >> 3; |
888 | dx = 0; | 888 | dx = 0; |
@@ -915,22 +915,22 @@ static void tdfxfb_copyarea(struct fb_info *info, | |||
915 | u32 dstbase = 0; | 915 | u32 dstbase = 0; |
916 | u32 srcbase = 0; | 916 | u32 srcbase = 0; |
917 | 917 | ||
918 | /* asume always area->height < 4096 */ | 918 | /* assume always area->height < 4096 */ |
919 | if (sy + area->height > 4095) { | 919 | if (sy + area->height > 4095) { |
920 | srcbase = stride * sy; | 920 | srcbase = stride * sy; |
921 | sy = 0; | 921 | sy = 0; |
922 | } | 922 | } |
923 | /* asume always area->width < 4096 */ | 923 | /* assume always area->width < 4096 */ |
924 | if (sx + area->width > 4095) { | 924 | if (sx + area->width > 4095) { |
925 | srcbase += sx * bpp >> 3; | 925 | srcbase += sx * bpp >> 3; |
926 | sx = 0; | 926 | sx = 0; |
927 | } | 927 | } |
928 | /* asume always area->height < 4096 */ | 928 | /* assume always area->height < 4096 */ |
929 | if (dy + area->height > 4095) { | 929 | if (dy + area->height > 4095) { |
930 | dstbase = stride * dy; | 930 | dstbase = stride * dy; |
931 | dy = 0; | 931 | dy = 0; |
932 | } | 932 | } |
933 | /* asume always area->width < 4096 */ | 933 | /* assume always area->width < 4096 */ |
934 | if (dx + area->width > 4095) { | 934 | if (dx + area->width > 4095) { |
935 | dstbase += dx * bpp >> 3; | 935 | dstbase += dx * bpp >> 3; |
936 | dx = 0; | 936 | dx = 0; |
@@ -1003,12 +1003,12 @@ static void tdfxfb_imageblit(struct fb_info *info, const struct fb_image *image) | |||
1003 | #else | 1003 | #else |
1004 | srcfmt = 0x400000; | 1004 | srcfmt = 0x400000; |
1005 | #endif | 1005 | #endif |
1006 | /* asume always image->height < 4096 */ | 1006 | /* assume always image->height < 4096 */ |
1007 | if (dy + image->height > 4095) { | 1007 | if (dy + image->height > 4095) { |
1008 | dstbase = stride * dy; | 1008 | dstbase = stride * dy; |
1009 | dy = 0; | 1009 | dy = 0; |
1010 | } | 1010 | } |
1011 | /* asume always image->width < 4096 */ | 1011 | /* assume always image->width < 4096 */ |
1012 | if (dx + image->width > 4095) { | 1012 | if (dx + image->width > 4095) { |
1013 | dstbase += dx * bpp >> 3; | 1013 | dstbase += dx * bpp >> 3; |
1014 | dx = 0; | 1014 | dx = 0; |
@@ -1124,7 +1124,7 @@ static int tdfxfb_cursor(struct fb_info *info, struct fb_cursor *cursor) | |||
1124 | * lower half (least significant 64 bits) of a 128 bit word | 1124 | * lower half (least significant 64 bits) of a 128 bit word |
1125 | * and pattern 1 the upper half. If you examine the data of | 1125 | * and pattern 1 the upper half. If you examine the data of |
1126 | * the cursor image the graphics card uses then from the | 1126 | * the cursor image the graphics card uses then from the |
1127 | * begining you see line one of pattern 0, line one of | 1127 | * beginning you see line one of pattern 0, line one of |
1128 | * pattern 1, line two of pattern 0, line two of pattern 1, | 1128 | * pattern 1, line two of pattern 0, line two of pattern 1, |
1129 | * etc etc. The linear stride for the cursor is always 16 bytes | 1129 | * etc etc. The linear stride for the cursor is always 16 bytes |
1130 | * (128 bits) which is the maximum cursor width times two for | 1130 | * (128 bits) which is the maximum cursor width times two for |