.set_config = gma_crtc_set_config,
        .destroy = gma_crtc_destroy,
        .page_flip = gma_crtc_page_flip,
-       .enable_vblank = gma_enable_vblank,
-       .disable_vblank = gma_disable_vblank,
-       .get_vblank_counter = gma_get_vblank_counter,
+       .enable_vblank = gma_crtc_enable_vblank,
+       .disable_vblank = gma_crtc_disable_vblank,
+       .get_vblank_counter = gma_crtc_get_vblank_counter,
 };
 
 /*
 
        free_irq(pdev->irq, dev);
 }
 
-int gma_enable_vblank(struct drm_crtc *crtc)
+int gma_crtc_enable_vblank(struct drm_crtc *crtc)
 {
        struct drm_device *dev = crtc->dev;
        unsigned int pipe = crtc->index;
        return 0;
 }
 
-void gma_disable_vblank(struct drm_crtc *crtc)
+void gma_crtc_disable_vblank(struct drm_crtc *crtc)
 {
        struct drm_device *dev = crtc->dev;
        unsigned int pipe = crtc->index;
 /* Called from drm generic code, passed a 'crtc', which
  * we use as a pipe index
  */
-u32 gma_get_vblank_counter(struct drm_crtc *crtc)
+u32 gma_crtc_get_vblank_counter(struct drm_crtc *crtc)
 {
        struct drm_device *dev = crtc->dev;
        unsigned int pipe = crtc->index;
 
 int  gma_irq_install(struct drm_device *dev, unsigned int irq);
 void gma_irq_uninstall(struct drm_device *dev);
 
-int  gma_enable_vblank(struct drm_crtc *crtc);
-void gma_disable_vblank(struct drm_crtc *crtc);
-u32  gma_get_vblank_counter(struct drm_crtc *crtc);
+int  gma_crtc_enable_vblank(struct drm_crtc *crtc);
+void gma_crtc_disable_vblank(struct drm_crtc *crtc);
+u32  gma_crtc_get_vblank_counter(struct drm_crtc *crtc);
 void gma_enable_pipestat(struct drm_psb_private *dev_priv, int pipe, u32 mask);
 void gma_disable_pipestat(struct drm_psb_private *dev_priv, int pipe, u32 mask);