drm/nouveau/kms/nv04-nv4x: move a bunch of pre-nv50 page flip code to dispnv04

[linux-2.6-block.git] / drivers / gpu / drm / nouveau / nouveau_display.h

diff --git a/drivers/gpu/drm/nouveau/nouveau_display.h b/drivers/gpu/drm/nouveau/nouveau_display.h
index eb77e41c2d4e21823d768d4073529570811d11ee..2676876a82c7ca9f22b93c5f419ad5ff4761a697 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_display.h
+++ b/drivers/gpu/drm/nouveau/nouveau_display.h
@@ -25,14 +25,6 @@ int nouveau_framebuffer_new(struct drm_device *,
                            const struct drm_mode_fb_cmd2 *,
                            struct nouveau_bo *, struct nouveau_framebuffer **);
 
-struct nouveau_page_flip_state {
-       struct list_head head;
-       struct drm_pending_vblank_event *event;
-       struct drm_crtc *crtc;
-       int bpp, pitch;
-       u64 offset;
-};
-
 struct nouveau_display {
        void *priv;
        void (*dtor)(struct drm_device *);
@@ -71,13 +63,6 @@ bool  nouveau_display_scanoutpos(struct drm_device *, unsigned int,
                                 bool, int *, int *, ktime_t *,
                                 ktime_t *, const struct drm_display_mode *);
 
-int  nouveau_crtc_page_flip(struct drm_crtc *crtc, struct drm_framebuffer *fb,
-                           struct drm_pending_vblank_event *event,
-                           uint32_t page_flip_flags,
-                           struct drm_modeset_acquire_ctx *ctx);
-int  nouveau_finish_page_flip(struct nouveau_channel *,
-                             struct nouveau_page_flip_state *);
-
 int  nouveau_display_dumb_create(struct drm_file *, struct drm_device *,
                                 struct drm_mode_create_dumb *args);
 int  nouveau_display_dumb_map_offset(struct drm_file *, struct drm_device *,