diff options
-rw-r--r-- | drivers/video/fbmem.c | 6 | ||||
-rw-r--r-- | include/linux/fb.h | 4 |
2 files changed, 10 insertions, 0 deletions
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c index 7b72841222df..c4ce3e44327e 100644 --- a/drivers/video/fbmem.c +++ b/drivers/video/fbmem.c | |||
@@ -1321,6 +1321,12 @@ register_framebuffer(struct fb_info *fb_info) | |||
1321 | } | 1321 | } |
1322 | fb_info->pixmap.offset = 0; | 1322 | fb_info->pixmap.offset = 0; |
1323 | 1323 | ||
1324 | if (!fb_info->pixmap.blit_x) | ||
1325 | fb_info->pixmap.blit_x = ~(u32)0; | ||
1326 | |||
1327 | if (!fb_info->pixmap.blit_y) | ||
1328 | fb_info->pixmap.blit_y = ~(u32)0; | ||
1329 | |||
1324 | if (!fb_info->modelist.prev || !fb_info->modelist.next) | 1330 | if (!fb_info->modelist.prev || !fb_info->modelist.next) |
1325 | INIT_LIST_HEAD(&fb_info->modelist); | 1331 | INIT_LIST_HEAD(&fb_info->modelist); |
1326 | 1332 | ||
diff --git a/include/linux/fb.h b/include/linux/fb.h index 70d154a02c5c..619ba1e40ab9 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h | |||
@@ -558,6 +558,10 @@ struct fb_pixmap { | |||
558 | u32 scan_align; /* alignment per scanline */ | 558 | u32 scan_align; /* alignment per scanline */ |
559 | u32 access_align; /* alignment per read/write (bits) */ | 559 | u32 access_align; /* alignment per read/write (bits) */ |
560 | u32 flags; /* see FB_PIXMAP_* */ | 560 | u32 flags; /* see FB_PIXMAP_* */ |
561 | u32 blit_x; /* supported bit block dimensions (1-32)*/ | ||
562 | u32 blit_y; /* Format: blit_x = 1 << (width - 1) */ | ||
563 | /* blit_y = 1 << (height - 1) */ | ||
564 | /* if 0, will be set to 0xffffffff (all)*/ | ||
561 | /* access methods */ | 565 | /* access methods */ |
562 | void (*writeio)(struct fb_info *info, void __iomem *dst, void *src, unsigned int size); | 566 | void (*writeio)(struct fb_info *info, void __iomem *dst, void *src, unsigned int size); |
563 | void (*readio) (struct fb_info *info, void *dst, void __iomem *src, unsigned int size); | 567 | void (*readio) (struct fb_info *info, void *dst, void __iomem *src, unsigned int size); |