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

[tomoyo/tomoyo-test1.git] / drivers / gpu / drm / drm_gem.c

diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c
index 75ef26d..6129b89 100644 (file)
--- a/drivers/gpu/drm/drm_gem.c
+++ b/drivers/gpu/drm/drm_gem.c
@@ -164,6 +164,9 @@ void drm_gem_private_object_init(struct drm_device *dev,
        if (!obj->resv)
                obj->resv = &obj->_resv;
 
+       if (drm_core_check_feature(dev, DRIVER_GEM_GPUVA))
+               drm_gem_gpuva_init(obj);
+
        drm_vma_node_reset(&obj->vma_node);
        INIT_LIST_HEAD(&obj->lru_node);
 }