Merge remote-tracking branch 'ovl/for-viro' into for-linus

[platform/kernel/linux-exynos.git] / drivers / gpu / drm / i915 / i915_gem_dmabuf.c

diff --git a/drivers/gpu/drm/i915/i915_gem_dmabuf.c b/drivers/gpu/drm/i915/i915_gem_dmabuf.c
index 84fc9f0..29bb801 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem_dmabuf.c
+++ b/drivers/gpu/drm/i915/i915_gem_dmabuf.c
@@ -278,7 +278,7 @@ struct drm_gem_object *i915_gem_prime_import(struct drm_device *dev,
 
        get_dma_buf(dma_buf);
 
-       obj = i915_gem_object_alloc(dev);
+       obj = i915_gem_object_alloc(to_i915(dev));
        if (obj == NULL) {
                ret = -ENOMEM;
                goto fail_detach;