diff options
Diffstat (limited to 'drivers/video/sis/sis_accel.h')
-rw-r--r-- | drivers/video/sis/sis_accel.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/video/sis/sis_accel.h b/drivers/video/sis/sis_accel.h index bb28f331d60d..046e2c4a8e09 100644 --- a/drivers/video/sis/sis_accel.h +++ b/drivers/video/sis/sis_accel.h | |||
@@ -1,6 +1,8 @@ | |||
1 | /* | 1 | /* |
2 | * SiS 300/630/730/540/315/550/650/740 frame buffer driver | 2 | * SiS 300/540/630[S]/730[S], |
3 | * for Linux kernels 2.4.x and 2.5.x | 3 | * SiS 315[E|PRO]/550/[M]650/651/[M]661[F|M]X/740/[M]741[GX]/330/[M]760[GX], |
4 | * XGI V3XT/V5/V8, Z7 | ||
5 | * frame buffer driver for Linux kernels >= 2.4.14 and >=2.6.3 | ||
4 | * | 6 | * |
5 | * 2D acceleration part | 7 | * 2D acceleration part |
6 | * | 8 | * |
@@ -283,6 +285,8 @@ | |||
283 | { \ | 285 | { \ |
284 | while( (MMIO_IN16(ivideo->mmio_vbase, Q_STATUS+2) & 0x8000) != 0x8000){}; \ | 286 | while( (MMIO_IN16(ivideo->mmio_vbase, Q_STATUS+2) & 0x8000) != 0x8000){}; \ |
285 | while( (MMIO_IN16(ivideo->mmio_vbase, Q_STATUS+2) & 0x8000) != 0x8000){}; \ | 287 | while( (MMIO_IN16(ivideo->mmio_vbase, Q_STATUS+2) & 0x8000) != 0x8000){}; \ |
288 | while( (MMIO_IN16(ivideo->mmio_vbase, Q_STATUS+2) & 0x8000) != 0x8000){}; \ | ||
289 | while( (MMIO_IN16(ivideo->mmio_vbase, Q_STATUS+2) & 0x8000) != 0x8000){}; \ | ||
286 | CmdQueLen = 0; \ | 290 | CmdQueLen = 0; \ |
287 | } | 291 | } |
288 | 292 | ||
@@ -402,6 +406,7 @@ void fbcon_sis_clear32(struct vc_data *conp, struct display *p, int srcy, | |||
402 | int srcx, int height, int width); | 406 | int srcx, int height, int width); |
403 | #endif | 407 | #endif |
404 | #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,34) | 408 | #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,34) |
409 | int fbcon_sis_sync(struct fb_info *info); | ||
405 | void fbcon_sis_fillrect(struct fb_info *info, const struct fb_fillrect *rect); | 410 | void fbcon_sis_fillrect(struct fb_info *info, const struct fb_fillrect *rect); |
406 | void fbcon_sis_copyarea(struct fb_info *info, const struct fb_copyarea *area); | 411 | void fbcon_sis_copyarea(struct fb_info *info, const struct fb_copyarea *area); |
407 | #endif | 412 | #endif |