diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-02-26 09:18:32 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-02-26 09:18:32 +0100 |
| commit | 64b9fb5704a479d98a59f2a1d45d3331a8f847f8 (patch) | |
| tree | 2b1052b05fa7615c817894bc9802bc5bb2af7ac1 /drivers/gpu/drm/nouveau/nouveau_fbcon.h | |
| parent | 83f0d53993b2967e54186468b0fc4321447f68f1 (diff) | |
| parent | 60b341b778cc2929df16c0a504c91621b3c6a4ad (diff) | |
| download | linux-64b9fb5704a479d98a59f2a1d45d3331a8f847f8.tar.gz linux-64b9fb5704a479d98a59f2a1d45d3331a8f847f8.tar.bz2 linux-64b9fb5704a479d98a59f2a1d45d3331a8f847f8.zip | |
Merge commit 'v2.6.33' into tracing/core
Conflicts:
scripts/recordmcount.pl
Merge reason: Merge up to v2.6.33.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_fbcon.h')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_fbcon.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.h b/drivers/gpu/drm/nouveau/nouveau_fbcon.h index 8531140fedbc..f9c34e1a8c11 100644 --- a/drivers/gpu/drm/nouveau/nouveau_fbcon.h +++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.h @@ -40,8 +40,15 @@ 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); #endif /* __NV50_FBCON_H__ */ |