diff options
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_fbcon.h')
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_fbcon.h | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.h b/drivers/gpu/drm/nouveau/nouveau_fbcon.h index f9c34e1a8c1..fa66cb9fa4d 100644 --- a/drivers/gpu/drm/nouveau/nouveau_fbcon.h +++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.h | |||
@@ -29,16 +29,16 @@ | |||
29 | 29 | ||
30 | #include "drm_fb_helper.h" | 30 | #include "drm_fb_helper.h" |
31 | 31 | ||
32 | #include "nouveau_fb.h" | ||
32 | struct nouveau_fbcon_par { | 33 | struct nouveau_fbcon_par { |
33 | struct drm_fb_helper helper; | 34 | struct drm_fb_helper helper; |
35 | struct nouveau_framebuffer nouveau_fb; | ||
36 | struct list_head fbdev_list; | ||
34 | struct drm_device *dev; | 37 | struct drm_device *dev; |
35 | struct nouveau_framebuffer *nouveau_fb; | 38 | unsigned int saved_flags; |
36 | }; | 39 | }; |
37 | 40 | ||
38 | int nouveau_fbcon_probe(struct drm_device *dev); | ||
39 | int nouveau_fbcon_remove(struct drm_device *dev, struct drm_framebuffer *fb); | ||
40 | void nouveau_fbcon_restore(void); | 41 | void nouveau_fbcon_restore(void); |
41 | void nouveau_fbcon_zfill(struct drm_device *dev); | ||
42 | 42 | ||
43 | void nv04_fbcon_copyarea(struct fb_info *info, const struct fb_copyarea *region); | 43 | void nv04_fbcon_copyarea(struct fb_info *info, const struct fb_copyarea *region); |
44 | void nv04_fbcon_fillrect(struct fb_info *info, const struct fb_fillrect *rect); | 44 | void nv04_fbcon_fillrect(struct fb_info *info, const struct fb_fillrect *rect); |
@@ -50,5 +50,12 @@ void nv50_fbcon_imageblit(struct fb_info *info, const struct fb_image *image); | |||
50 | int nv50_fbcon_accel_init(struct fb_info *info); | 50 | int nv50_fbcon_accel_init(struct fb_info *info); |
51 | 51 | ||
52 | void nouveau_fbcon_gpu_lockup(struct fb_info *info); | 52 | void nouveau_fbcon_gpu_lockup(struct fb_info *info); |
53 | |||
54 | int nouveau_fbcon_init(struct drm_device *dev); | ||
55 | void nouveau_fbcon_fini(struct drm_device *dev); | ||
56 | void nouveau_fbcon_set_suspend(struct drm_device *dev, int state); | ||
57 | void nouveau_fbcon_zfill_all(struct drm_device *dev); | ||
58 | void nouveau_fbcon_save_disable_accel(struct drm_device *dev); | ||
59 | void nouveau_fbcon_restore_accel(struct drm_device *dev); | ||
53 | #endif /* __NV50_FBCON_H__ */ | 60 | #endif /* __NV50_FBCON_H__ */ |
54 | 61 | ||