Merge branch 'drm-next-3.12' of git://people.freedesktop.org/~agd5f/linux into drm...

[~andy/linux] / drivers / gpu / drm / mgag200 / mgag200_ttm.c

diff --git a/drivers/gpu/drm/mgag200/mgag200_ttm.c b/drivers/gpu/drm/mgag200/mgag200_ttm.c
index d70e4a92773bfda96079b1406ffffa9a2f65a0e7..07b192fe15c6c6f9d0c23434280972616693ca48 100644 (file)
--- a/drivers/gpu/drm/mgag200/mgag200_ttm.c
+++ b/drivers/gpu/drm/mgag200/mgag200_ttm.c
@@ -148,7 +148,9 @@ mgag200_bo_evict_flags(struct ttm_buffer_object *bo, struct ttm_placement *pl)
 
 static int mgag200_bo_verify_access(struct ttm_buffer_object *bo, struct file *filp)
 {
-       return 0;
+       struct mgag200_bo *mgabo = mgag200_bo(bo);
+
+       return drm_vma_node_verify_access(&mgabo->gem.vma_node, filp);
 }
 
 static int mgag200_ttm_io_mem_reserve(struct ttm_bo_device *bdev,
@@ -321,7 +323,6 @@ int mgag200_bo_create(struct drm_device *dev, int size, int align,
                return ret;
        }
 
-       mgabo->gem.driver_private = NULL;
        mgabo->bo.bdev = &mdev->ttm.bdev;
        mgabo->bo.bdev->dev_mapping = dev->dev_mapping;