drm: Make drm_local_map use a resource_size_t offset

[deliverable/linux.git] / drivers / gpu / drm / mga / mga_drv.h

diff --git a/drivers/gpu/drm/mga/mga_drv.h b/drivers/gpu/drm/mga/mga_drv.h
index f6ebd24bd5871ebad2204c64195e3e3e31219401..3d264f288237451857505c0136423698764ee36c 100644 (file)
--- a/drivers/gpu/drm/mga/mga_drv.h
+++ b/drivers/gpu/drm/mga/mga_drv.h
@@ -113,13 +113,14 @@ typedef struct drm_mga_private {
         * \sa drm_mga_private_t::mmio
         */
        /*@{ */
-       u32 mmio_base;             /**< Bus address of base of MMIO. */
-       u32 mmio_size;             /**< Size of the MMIO region. */
+       resource_size_t mmio_base;         /**< Bus address of base of MMIO. */
+       resource_size_t mmio_size;         /**< Size of the MMIO region. */
        /*@} */
 
        u32 clear_cmd;
        u32 maccess;
 
+       atomic_t vbl_received;          /**< Number of vblanks received. */
        wait_queue_head_t fence_queue;
        atomic_t last_fence_retired;
        u32 next_fence_to_post;
@@ -181,11 +182,14 @@ extern int mga_warp_install_microcode(drm_mga_private_t * dev_priv);
 extern int mga_warp_init(drm_mga_private_t * dev_priv);
 
                                /* mga_irq.c */
+extern int mga_enable_vblank(struct drm_device *dev, int crtc);
+extern void mga_disable_vblank(struct drm_device *dev, int crtc);
+extern u32 mga_get_vblank_counter(struct drm_device *dev, int crtc);
 extern int mga_driver_fence_wait(struct drm_device * dev, unsigned int *sequence);
 extern int mga_driver_vblank_wait(struct drm_device * dev, unsigned int *sequence);
 extern irqreturn_t mga_driver_irq_handler(DRM_IRQ_ARGS);
 extern void mga_driver_irq_preinstall(struct drm_device * dev);
-extern void mga_driver_irq_postinstall(struct drm_device * dev);
+extern int mga_driver_irq_postinstall(struct drm_device *dev);
 extern void mga_driver_irq_uninstall(struct drm_device * dev);
 extern long mga_compat_ioctl(struct file *filp, unsigned int cmd,
                             unsigned long arg);
@@ -313,8 +317,8 @@ do {                                                                        \
                DRM_INFO( "\n" );                                       \
                DRM_INFO( "   tail=0x%06x head=0x%06lx\n",              \
                          dev_priv->prim.tail,                          \
-                         MGA_READ( MGA_PRIMADDRESS ) -                 \
-                         dev_priv->primary->offset );                  \
+                         (unsigned long)(MGA_READ(MGA_PRIMADDRESS) -   \
+                                         dev_priv->primary->offset));  \
        }                                                               \
        if ( !test_bit( 0, &dev_priv->prim.wrapped ) ) {                \
                if ( dev_priv->prim.space <                             \