Merge drm/drm-next into drm-misc-next

[tomoyo/tomoyo-test1.git] / drivers / gpu / drm / vmwgfx / vmwgfx_drv.h

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
index 5eb73de..29f60e0 100644 (file)
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
@@ -438,6 +438,7 @@ struct vmw_private {
        struct vmw_fifo_state fifo;
 
        struct drm_device *dev;
+       struct drm_vma_offset_manager vma_manager;
        unsigned long vmw_chipset;
        unsigned int io_start;
        uint32_t vram_start;