diff options
| author | Marcin Kościelnicki <koriakin@0x04.net> | 2010-01-27 14:03:18 +0000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2010-02-09 12:50:14 +1000 |
| commit | 126b5440565a1fa0cb49fd30041525d5a9a848f5 (patch) | |
| tree | 7809ee1d5f9928bd31b630e94a172120e04c9ad0 /drivers/gpu/drm/nouveau/nouveau_fbcon.h | |
| parent | 7dad9ef6d9255b4d2d0a26305a785a55f3ba55e3 (diff) | |
| download | op-kernel-dev-126b5440565a1fa0cb49fd30041525d5a9a848f5.zip op-kernel-dev-126b5440565a1fa0cb49fd30041525d5a9a848f5.tar.gz | |
drm/nouveau: Fix fbcon on mixed pre-NV50 + NV50 multicard.
We used single shared fbops struct and patched it at fb init time with
pointers to the right variant. On mixed multicard, this meant that
it was either sending NV50-style commands to all cards, or NV04-style
commands to all cards.
Signed-off-by: Marcin Kościelnicki <koriakin@0x04.net>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_fbcon.h')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_fbcon.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.h b/drivers/gpu/drm/nouveau/nouveau_fbcon.h index 462e0b8..f9c34e1 100644 --- a/drivers/gpu/drm/nouveau/nouveau_fbcon.h +++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.h @@ -40,7 +40,13 @@ int nouveau_fbcon_remove(struct drm_device *dev, struct drm_framebuffer *fb); void nouveau_fbcon_restore(void); void nouveau_fbcon_zfill(struct drm_device *dev); +void nv04_fbcon_copyarea(struct fb_info *info, const struct fb_copyarea *region); +void nv04_fbcon_fillrect(struct fb_info *info, const struct fb_fillrect *rect); +void nv04_fbcon_imageblit(struct fb_info *info, const struct fb_image *image); int nv04_fbcon_accel_init(struct fb_info *info); +void nv50_fbcon_fillrect(struct fb_info *info, const struct fb_fillrect *rect); +void nv50_fbcon_copyarea(struct fb_info *info, const struct fb_copyarea *region); +void nv50_fbcon_imageblit(struct fb_info *info, const struct fb_image *image); int nv50_fbcon_accel_init(struct fb_info *info); void nouveau_fbcon_gpu_lockup(struct fb_info *info); |
