drm/vmwgfx: Switch to a managed drm device

[linux-2.6-microblaze.git] / drivers / gpu / drm / vmwgfx / vmwgfx_stdu.c

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c b/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c
index 5b04ec0..d0d40da 100644 (file)
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c
@@ -512,7 +512,7 @@ static void vmw_stdu_bo_fifo_commit(struct vmw_kms_dirty *dirty)
        cmd->body.host.mipmap = 0;
        cmd->body.transfer = ddirty->transfer;
        suffix->suffixSize = sizeof(*suffix);
-       suffix->maximumOffset = ddirty->buf->base.num_pages * PAGE_SIZE;
+       suffix->maximumOffset = ddirty->buf->base.base.size;
 
        if (ddirty->transfer == SVGA3D_WRITE_HOST_VRAM) {
                blit_size += sizeof(struct vmw_stdu_update);
@@ -1238,7 +1238,7 @@ static uint32_t vmw_stdu_bo_populate_update(struct vmw_du_update_plane  *update,
        vfbbo = container_of(update->vfb, typeof(*vfbbo), base);
 
        suffix->suffixSize = sizeof(*suffix);
-       suffix->maximumOffset = vfbbo->buffer->base.num_pages * PAGE_SIZE;
+       suffix->maximumOffset = vfbbo->buffer->base.base.size;
 
        vmw_stdu_populate_update(&suffix[1], stdu->base.unit, bb->x1, bb->x2,
                                 bb->y1, bb->y2);
@@ -1713,7 +1713,7 @@ static const struct drm_crtc_helper_funcs vmw_stdu_crtc_helper_funcs = {
 static int vmw_stdu_init(struct vmw_private *dev_priv, unsigned unit)
 {
        struct vmw_screen_target_display_unit *stdu;
-       struct drm_device *dev = dev_priv->dev;
+       struct drm_device *dev = &dev_priv->drm;
        struct drm_connector *connector;
        struct drm_encoder *encoder;
        struct drm_plane *primary, *cursor;
@@ -1861,7 +1861,7 @@ static void vmw_stdu_destroy(struct vmw_screen_target_display_unit *stdu)
  */
 int vmw_kms_stdu_init_display(struct vmw_private *dev_priv)
 {
-       struct drm_device *dev = dev_priv->dev;
+       struct drm_device *dev = &dev_priv->drm;
        int i, ret;