Merge tag 'selinux-pr-20190917' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux.git] / drivers / gpu / drm / i915 / gem / selftests / i915_gem_dmabuf.c

diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c b/drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c
index e3a64edef91897b013737b94cdbc08955f8e5466..d85d1ce273ca873f1c8fff45cff8e8e195cb1541 100644 (file)
--- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c
+++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c
@@ -20,7 +20,7 @@ static int igt_dmabuf_export(void *arg)
        if (IS_ERR(obj))
                return PTR_ERR(obj);
 
-       dmabuf = i915_gem_prime_export(&i915->drm, &obj->base, 0);
+       dmabuf = i915_gem_prime_export(&obj->base, 0);
        i915_gem_object_put(obj);
        if (IS_ERR(dmabuf)) {
                pr_err("i915_gem_prime_export failed with err=%d\n",
@@ -44,7 +44,7 @@ static int igt_dmabuf_import_self(void *arg)
        if (IS_ERR(obj))
                return PTR_ERR(obj);
 
-       dmabuf = i915_gem_prime_export(&i915->drm, &obj->base, 0);
+       dmabuf = i915_gem_prime_export(&obj->base, 0);
        if (IS_ERR(dmabuf)) {
                pr_err("i915_gem_prime_export failed with err=%d\n",
                       (int)PTR_ERR(dmabuf));
@@ -219,7 +219,7 @@ static int igt_dmabuf_export_vmap(void *arg)
        if (IS_ERR(obj))
                return PTR_ERR(obj);
 
-       dmabuf = i915_gem_prime_export(&i915->drm, &obj->base, 0);
+       dmabuf = i915_gem_prime_export(&obj->base, 0);
        if (IS_ERR(dmabuf)) {
                pr_err("i915_gem_prime_export failed with err=%d\n",
                       (int)PTR_ERR(dmabuf));
@@ -266,7 +266,7 @@ static int igt_dmabuf_export_kmap(void *arg)
        if (IS_ERR(obj))
                return PTR_ERR(obj);
 
-       dmabuf = i915_gem_prime_export(&i915->drm, &obj->base, 0);
+       dmabuf = i915_gem_prime_export(&obj->base, 0);
        i915_gem_object_put(obj);
        if (IS_ERR(dmabuf)) {
                err = PTR_ERR(dmabuf);