diff options
| author | Marcin Slusarz <marcin.slusarz@gmail.com> | 2010-05-16 17:33:09 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-05-18 16:19:30 +1000 |
| commit | 3b9676e7ac6eff4f50f1b48b6c36664f55b79507 (patch) | |
| tree | b9c1367db290a66f1cba4f78a488f7e25e779b79 /include/linux | |
| parent | 06415c564fb98562a4d6b6215615deb2d1cc0dae (diff) | |
| download | linux-stable-3b9676e7ac6eff4f50f1b48b6c36664f55b79507.tar.gz linux-stable-3b9676e7ac6eff4f50f1b48b6c36664f55b79507.tar.bz2 linux-stable-3b9676e7ac6eff4f50f1b48b6c36664f55b79507.zip | |
vga16fb, drm: vga16fb->drm handoff
let vga16fb claim 0xA0000+0x10000 region as its aperture;
drm drivers don't use it, so we have to detect it and kick
vga16fb manually - but only if drm is driving the primary card
Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
Cc: James Simmons <jsimmons@infradead.org>
Cc: Dave Airlie <airlied@redhat.com>
Cc: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/fb.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/fb.h b/include/linux/fb.h index f88e2549123d..1296af45169d 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h @@ -971,7 +971,8 @@ extern ssize_t fb_sys_write(struct fb_info *info, const char __user *buf, /* drivers/video/fbmem.c */ extern int register_framebuffer(struct fb_info *fb_info); extern int unregister_framebuffer(struct fb_info *fb_info); -extern void remove_conflicting_framebuffers(struct apertures_struct *a, const char *name); +extern void remove_conflicting_framebuffers(struct apertures_struct *a, + const char *name, bool primary); extern int fb_prepare_logo(struct fb_info *fb_info, int rotate); extern int fb_show_logo(struct fb_info *fb_info, int rotate); extern char* fb_get_buffer_offset(struct fb_info *info, struct fb_pixmap *buf, u32 size); |