drm/i915/selftests: Complete transition to a real struct file mock

Since drm provided us with a real struct file we can use for our
anonymous internal clients (mock_file), complete our transition to using
that as the primary interface (and not the mocked up struct drm_file we
previous were using).

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Matthew Auld <matthew.auld@intel.com>
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191107213929.23286-1-chris@chris-wilson.co.uk

diff --git a/drivers/gpu/drm/i915/gem/selftests/huge_pages.c b/drivers/gpu/drm/i915/gem/selftests/huge_pages.c
index 2310ed9b8f89597b18198811a97974e6a7908968..3f992491f537b88853fd373cf01e24d6e6d28777 100644 (file)
--- a/drivers/gpu/drm/i915/gem/selftests/huge_pages.c
+++ b/drivers/gpu/drm/i915/gem/selftests/huge_pages.c
@@ -1912,9 +1912,9 @@ int i915_gem_huge_page_live_selftests(struct drm_i915_private *i915)
                SUBTEST(igt_ppgtt_smoke_huge),
                SUBTEST(igt_ppgtt_sanity_check),
        };
-       struct drm_file *file;
        struct i915_gem_context *ctx;
        struct i915_address_space *vm;
+       struct file *file;
        int err;
 
        if (!HAS_PPGTT(i915)) {
@@ -1944,6 +1944,6 @@ int i915_gem_huge_page_live_selftests(struct drm_i915_private *i915)
        err = i915_subtests(tests, ctx);
 
 out_file:
-       mock_file_put(file);
+       fput(file);
        return err;
 }

diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c b/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c
index 47890c92534ca663d220082ff5e4edad8e4fba6c..896f47d80a1c22a9bec9cff126ef2674cea08323 100644 (file)
--- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c
@@ -33,7 +33,7 @@ static int live_nop_switch(void *arg)
        struct intel_engine_cs *engine;
        struct i915_gem_context **ctx;
        struct igt_live_test t;
-       struct drm_file *file;
+       struct file *file;
        unsigned long n;
        int err = -ENODEV;
 
@@ -149,7 +149,7 @@ static int live_nop_switch(void *arg)
        }
 
 out_file:
-       mock_file_put(file);
+       fput(file);
        return err;
 }
 
@@ -255,7 +255,7 @@ static int live_parallel_switch(void *arg)
        int (* const *fn)(void *arg);
        struct i915_gem_context *ctx;
        struct intel_context *ce;
-       struct drm_file *file;
+       struct file *file;
        int n, m, count;
        int err = 0;
 
@@ -377,7 +377,7 @@ out:
        }
        kfree(data);
 out_file:
-       mock_file_put(file);
+       fput(file);
        return err;
 }
 
@@ -502,17 +502,17 @@ out_unmap:
        return err;
 }
 
-static int file_add_object(struct drm_file *file,
-                           struct drm_i915_gem_object *obj)
+static int file_add_object(struct file *file, struct drm_i915_gem_object *obj)
 {
        int err;
 
        GEM_BUG_ON(obj->base.handle_count);
 
        /* tie the object to the drm_file for easy reaping */
-       err = idr_alloc(&file->object_idr, &obj->base, 1, 0, GFP_KERNEL);
+       err = idr_alloc(&to_drm_file(file)->object_idr,
+                       &obj->base, 1, 0, GFP_KERNEL);
        if (err < 0)
-               return  err;
+               return err;
 
        i915_gem_object_get(obj);
        obj->base.handle_count++;
@@ -521,7 +521,7 @@ static int file_add_object(struct drm_file *file,
 
 static struct drm_i915_gem_object *
 create_test_object(struct i915_address_space *vm,
-                  struct drm_file *file,
+                  struct file *file,
                   struct list_head *objects)
 {
        struct drm_i915_gem_object *obj;
@@ -621,9 +621,9 @@ static int igt_ctx_exec(void *arg)
                unsigned long ncontexts, ndwords, dw;
                struct i915_request *tq[5] = {};
                struct igt_live_test t;
-               struct drm_file *file;
                IGT_TIMEOUT(end_time);
                LIST_HEAD(objects);
+               struct file *file;
 
                if (!intel_engine_can_store_dword(engine))
                        continue;
@@ -716,7 +716,7 @@ out_file:
                if (igt_live_test_end(&t))
                        err = -EIO;
 
-               mock_file_put(file);
+               fput(file);
                if (err)
                        return err;
 
@@ -733,7 +733,7 @@ static int igt_shared_ctx_exec(void *arg)
        struct i915_gem_context *parent;
        struct intel_engine_cs *engine;
        struct igt_live_test t;
-       struct drm_file *file;
+       struct file *file;
        int err = 0;
 
        /*
@@ -854,7 +854,7 @@ out_test:
        if (igt_live_test_end(&t))
                err = -EIO;
 out_file:
-       mock_file_put(file);
+       fput(file);
        return err;
 }
 
@@ -1317,10 +1317,10 @@ static int igt_ctx_readonly(void *arg)
        struct i915_gem_context *ctx;
        unsigned long idx, ndwords, dw;
        struct igt_live_test t;
-       struct drm_file *file;
        I915_RND_STATE(prng);
        IGT_TIMEOUT(end_time);
        LIST_HEAD(objects);
+       struct file *file;
        int err = -ENODEV;
 
        /*
@@ -1426,7 +1426,7 @@ out_file:
        if (igt_live_test_end(&t))
                err = -EIO;
 
-       mock_file_put(file);
+       fput(file);
        return err;
 }
 
@@ -1663,9 +1663,9 @@ static int igt_vm_isolation(void *arg)
        struct i915_gem_context *ctx_a, *ctx_b;
        struct intel_engine_cs *engine;
        struct igt_live_test t;
-       struct drm_file *file;
        I915_RND_STATE(prng);
        unsigned long count;
+       struct file *file;
        u64 vm_total;
        int err;
 
@@ -1750,7 +1750,7 @@ static int igt_vm_isolation(void *arg)
 out_file:
        if (igt_live_test_end(&t))
                err = -EIO;
-       mock_file_put(file);
+       fput(file);
        return err;
 }
 

diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_object_blt.c b/drivers/gpu/drm/i915/gem/selftests/i915_gem_object_blt.c
index d9fdfddb7091678975d1ed22aa3cc3c01cfad288..dd43ea0c9025fef616014bbd96cd89984ce064dc 100644 (file)
--- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_object_blt.c
+++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_object_blt.c
@@ -198,7 +198,7 @@ static int igt_fill_blt_thread(void *arg)
        struct drm_i915_gem_object *obj;
        struct i915_gem_context *ctx;
        struct intel_context *ce;
-       struct drm_file *file;
+       struct file *file;
        unsigned int prio;
        IGT_TIMEOUT(end);
        int err;
@@ -301,7 +301,7 @@ err_flush:
 
        intel_context_put(ce);
 out_file:
-       mock_file_put(file);
+       fput(file);
        return err;
 }
 
@@ -313,7 +313,7 @@ static int igt_copy_blt_thread(void *arg)
        struct drm_i915_gem_object *src, *dst;
        struct i915_gem_context *ctx;
        struct intel_context *ce;
-       struct drm_file *file;
+       struct file *file;
        unsigned int prio;
        IGT_TIMEOUT(end);
        int err;
@@ -432,7 +432,7 @@ err_flush:
 
        intel_context_put(ce);
 out_file:
-       mock_file_put(file);
+       fput(file);
        return err;
 }
 

diff --git a/drivers/gpu/drm/i915/gem/selftests/mock_context.c b/drivers/gpu/drm/i915/gem/selftests/mock_context.c
index 29b8984f0e4765c5974b255a6bc14ea1443965e2..cdcb006321a7d52fca8e32917f2a1c7dfbfa51f4 100644 (file)
--- a/drivers/gpu/drm/i915/gem/selftests/mock_context.c
+++ b/drivers/gpu/drm/i915/gem/selftests/mock_context.c
@@ -5,6 +5,7 @@
  */
 
 #include "mock_context.h"
+#include "selftests/mock_drm.h"
 #include "selftests/mock_gtt.h"
 
 struct i915_gem_context *
@@ -74,7 +75,7 @@ void mock_init_contexts(struct drm_i915_private *i915)
 }
 
 struct i915_gem_context *
-live_context(struct drm_i915_private *i915, struct drm_file *file)
+live_context(struct drm_i915_private *i915, struct file *file)
 {
        struct i915_gem_context *ctx;
        int err;
@@ -83,7 +84,7 @@ live_context(struct drm_i915_private *i915, struct drm_file *file)
        if (IS_ERR(ctx))
                return ctx;
 
-       err = gem_context_register(ctx, file->driver_priv);
+       err = gem_context_register(ctx, to_drm_file(file)->driver_priv);
        if (err < 0)
                goto err_ctx;
 

diff --git a/drivers/gpu/drm/i915/gem/selftests/mock_context.h b/drivers/gpu/drm/i915/gem/selftests/mock_context.h
index 45de09ec28d1d939be794ff7eed3c09284581752..c858db2362f1ebfc66a1628934c35822d30677ef 100644 (file)
--- a/drivers/gpu/drm/i915/gem/selftests/mock_context.h
+++ b/drivers/gpu/drm/i915/gem/selftests/mock_context.h
@@ -19,7 +19,7 @@ mock_context(struct drm_i915_private *i915,
 void mock_context_close(struct i915_gem_context *ctx);
 
 struct i915_gem_context *
-live_context(struct drm_i915_private *i915, struct drm_file *file);
+live_context(struct drm_i915_private *i915, struct file *file);
 
 struct i915_gem_context *kernel_context(struct drm_i915_private *i915);
 void kernel_context_close(struct i915_gem_context *ctx);

diff --git a/drivers/gpu/drm/i915/gt/selftest_context.c b/drivers/gpu/drm/i915/gt/selftest_context.c
index a5688f7d9073b0b7ed80b06da9447f2be5711e29..14ba6ceb917779e807ae9511501c17d08762e020 100644 (file)
--- a/drivers/gpu/drm/i915/gt/selftest_context.c
+++ b/drivers/gpu/drm/i915/gt/selftest_context.c
@@ -289,7 +289,7 @@ static int live_active_context(void *arg)
        struct intel_engine_cs *engine;
        struct i915_gem_context *fixme;
        enum intel_engine_id id;
-       struct drm_file *file;
+       struct file *file;
        int err = 0;
 
        file = mock_file(gt->i915);
@@ -313,7 +313,7 @@ static int live_active_context(void *arg)
        }
 
 out_file:
-       mock_file_put(file);
+       fput(file);
        return err;
 }
 
@@ -399,7 +399,7 @@ static int live_remote_context(void *arg)
        struct intel_engine_cs *engine;
        struct i915_gem_context *fixme;
        enum intel_engine_id id;
-       struct drm_file *file;
+       struct file *file;
        int err = 0;
 
        file = mock_file(gt->i915);
@@ -423,7 +423,7 @@ static int live_remote_context(void *arg)
        }
 
 out_file:
-       mock_file_put(file);
+       fput(file);
        return err;
 }
 

diff --git a/drivers/gpu/drm/i915/gt/selftest_hangcheck.c b/drivers/gpu/drm/i915/gt/selftest_hangcheck.c
index cdaaee4432b2a64bd3dc0928cda058b4109aa2a7..d155c9374453fc5e80586b407408c53f941d7906 100644 (file)
--- a/drivers/gpu/drm/i915/gt/selftest_hangcheck.c
+++ b/drivers/gpu/drm/i915/gt/selftest_hangcheck.c
@@ -380,8 +380,8 @@ static int igt_reset_nop(void *arg)
        struct i915_gem_context *ctx;
        unsigned int reset_count, count;
        enum intel_engine_id id;
-       struct drm_file *file;
        IGT_TIMEOUT(end_time);
+       struct file *file;
        int err = 0;
 
        /* Check that we can reset during non-user portions of requests */
@@ -439,7 +439,7 @@ static int igt_reset_nop(void *arg)
 
        err = igt_flush_test(gt->i915);
 out:
-       mock_file_put(file);
+       fput(file);
        if (intel_gt_is_wedged(gt))
                err = -EIO;
        return err;
@@ -452,7 +452,7 @@ static int igt_reset_nop_engine(void *arg)
        struct intel_engine_cs *engine;
        struct i915_gem_context *ctx;
        enum intel_engine_id id;
-       struct drm_file *file;
+       struct file *file;
        int err = 0;
 
        /* Check that we can engine-reset during non-user portions */
@@ -535,7 +535,7 @@ static int igt_reset_nop_engine(void *arg)
 
        err = igt_flush_test(gt->i915);
 out:
-       mock_file_put(file);
+       fput(file);
        if (intel_gt_is_wedged(gt))
                err = -EIO;
        return err;
@@ -700,8 +700,8 @@ static int active_engine(void *data)
        struct intel_engine_cs *engine = arg->engine;
        struct i915_request *rq[8] = {};
        struct i915_gem_context *ctx[ARRAY_SIZE(rq)];
-       struct drm_file *file;
        unsigned long count = 0;
+       struct file *file;
        int err = 0;
 
        file = mock_file(engine->i915);
@@ -752,7 +752,7 @@ static int active_engine(void *data)
        }
 
 err_file:
-       mock_file_put(file);
+       fput(file);
        return err;
 }
 
@@ -1302,7 +1302,7 @@ static int igt_reset_evict_ppgtt(void *arg)
        struct intel_gt *gt = arg;
        struct i915_gem_context *ctx;
        struct i915_address_space *vm;
-       struct drm_file *file;
+       struct file *file;
        int err;
 
        file = mock_file(gt->i915);
@@ -1325,7 +1325,7 @@ static int igt_reset_evict_ppgtt(void *arg)
        i915_vm_put(vm);
 
 out:
-       mock_file_put(file);
+       fput(file);
        return err;
 }
 

diff --git a/drivers/gpu/drm/i915/gt/selftest_workarounds.c b/drivers/gpu/drm/i915/gt/selftest_workarounds.c
index 5c69ec5c5ef940ba25c3727b97e6d6349f3a6720..d5d1e1a32187f25a26862e5c7d93c8cc432eedbd 100644 (file)
--- a/drivers/gpu/drm/i915/gt/selftest_workarounds.c
+++ b/drivers/gpu/drm/i915/gt/selftest_workarounds.c
@@ -711,7 +711,7 @@ static int live_dirty_whitelist(void *arg)
        struct intel_engine_cs *engine;
        struct i915_gem_context *ctx;
        enum intel_engine_id id;
-       struct drm_file *file;
+       struct file *file;
        int err = 0;
 
        /* Can the user write to the whitelisted registers? */
@@ -739,7 +739,7 @@ static int live_dirty_whitelist(void *arg)
        }
 
 out_file:
-       mock_file_put(file);
+       fput(file);
        return err;
 }
 

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 82e4e6bf08c37db44a391fefe5d0264cf836aaaf..64f8ba3449ed5faea5d5842c9b7027e9c9940928 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -2781,7 +2781,3 @@ static struct drm_driver driver = {
        .minor = DRIVER_MINOR,
        .patchlevel = DRIVER_PATCHLEVEL,
 };
-
-#if IS_ENABLED(CONFIG_DRM_I915_SELFTEST)
-#include "selftests/mock_drm.c"
-#endif

diff --git a/drivers/gpu/drm/i915/selftests/i915_gem.c b/drivers/gpu/drm/i915/selftests/i915_gem.c
index aa6282adfd0948cb5c7a87e5a7ff263184e502cc..657e23a8dd11e74ad25e809b33e63fa3e4e3e236 100644 (file)
--- a/drivers/gpu/drm/i915/selftests/i915_gem.c
+++ b/drivers/gpu/drm/i915/selftests/i915_gem.c
@@ -136,7 +136,7 @@ static int igt_gem_suspend(void *arg)
 {
        struct drm_i915_private *i915 = arg;
        struct i915_gem_context *ctx;
-       struct drm_file *file;
+       struct file *file;
        int err;
 
        file = mock_file(i915);
@@ -163,7 +163,7 @@ static int igt_gem_suspend(void *arg)
 
        err = switch_to_context(ctx);
 out:
-       mock_file_put(file);
+       fput(file);
        return err;
 }
 
@@ -171,7 +171,7 @@ static int igt_gem_hibernate(void *arg)
 {
        struct drm_i915_private *i915 = arg;
        struct i915_gem_context *ctx;
-       struct drm_file *file;
+       struct file *file;
        int err;
 
        file = mock_file(i915);
@@ -198,7 +198,7 @@ static int igt_gem_hibernate(void *arg)
 
        err = switch_to_context(ctx);
 out:
-       mock_file_put(file);
+       fput(file);
        return err;
 }
 

diff --git a/drivers/gpu/drm/i915/selftests/i915_gem_evict.c b/drivers/gpu/drm/i915/selftests/i915_gem_evict.c
index 41092dcea5b1c97e742159e9b99c965f4ac2a499..5f133d177212dfb1afbb5cd55ccd8ee3663905f8 100644 (file)
--- a/drivers/gpu/drm/i915/selftests/i915_gem_evict.c
+++ b/drivers/gpu/drm/i915/selftests/i915_gem_evict.c
@@ -466,7 +466,7 @@ static int igt_evict_contexts(void *arg)
        /* Overfill the GGTT with context objects and so try to evict one. */
        for_each_engine(engine, gt, id) {
                struct i915_sw_fence fence;
-               struct drm_file *file;
+               struct file *file;
 
                file = mock_file(i915);
                if (IS_ERR(file)) {
@@ -515,7 +515,7 @@ static int igt_evict_contexts(void *arg)
                pr_info("Submitted %lu contexts/requests on %s\n",
                        count, engine->name);
 
-               mock_file_put(file);
+               fput(file);
                if (err)
                        break;
        }

diff --git a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
index c3e0d63c4d0c55cb8f90af99453f69ba42e74c36..d94db487c4dd6eff0c12e37ce923ca356eb197fe 100644 (file)
--- a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
@@ -1001,9 +1001,9 @@ static int exercise_ppgtt(struct drm_i915_private *dev_priv,
                                      u64 hole_start, u64 hole_end,
                                      unsigned long end_time))
 {
-       struct drm_file *file;
        struct i915_ppgtt *ppgtt;
        IGT_TIMEOUT(end_time);
+       struct file *file;
        int err;
 
        if (!HAS_FULL_PPGTT(dev_priv))
@@ -1026,7 +1026,7 @@ static int exercise_ppgtt(struct drm_i915_private *dev_priv,
        i915_vm_put(&ppgtt->vm);
 
 out_free:
-       mock_file_put(file);
+       fput(file);
        return err;
 }
 
@@ -1782,9 +1782,9 @@ static int igt_cs_tlb(void *arg)
        struct i915_address_space *vm;
        struct i915_gem_context *ctx;
        struct intel_context *ce;
-       struct drm_file *file;
        struct i915_vma *vma;
        I915_RND_STATE(prng);
+       struct file *file;
        unsigned int i;
        u32 *result;
        u32 *batch;
@@ -2022,7 +2022,7 @@ out_put_bbe:
 out_vm:
        i915_vm_put(vm);
 out_unlock:
-       mock_file_put(file);
+       fput(file);
        return err;
 }
 

diff --git a/drivers/gpu/drm/i915/selftests/i915_request.c b/drivers/gpu/drm/i915/selftests/i915_request.c
index 7c56ee38cc5bee76b07337720e546aa00d145b16..50cc7ca9afbab010c34bf13a61dd3c52d070086f 100644 (file)
--- a/drivers/gpu/drm/i915/selftests/i915_request.c
+++ b/drivers/gpu/drm/i915/selftests/i915_request.c
@@ -1306,9 +1306,9 @@ static int live_breadcrumbs_smoketest(void *arg)
        struct task_struct **threads;
        struct igt_live_test live;
        intel_wakeref_t wakeref;
-       struct drm_file *file;
        struct smoketest *smoke;
        unsigned int n, idx;
+       struct file *file;
        int ret = 0;
 
        /*
@@ -1430,7 +1430,7 @@ out_threads:
 out_smoke:
        kfree(smoke);
 out_file:
-       mock_file_put(file);
+       fput(file);
 out_rpm:
        intel_runtime_pm_put(&i915->runtime_pm, wakeref);
 

diff --git a/drivers/gpu/drm/i915/selftests/intel_memory_region.c b/drivers/gpu/drm/i915/selftests/intel_memory_region.c
index f8497ad90f53744c21fd0095b91d6e4aa69f3eef..b609165614623723389a3bf833d0b78ce479fd3b 100644 (file)
--- a/drivers/gpu/drm/i915/selftests/intel_memory_region.c
+++ b/drivers/gpu/drm/i915/selftests/intel_memory_region.c
@@ -404,7 +404,7 @@ static int igt_lmem_write_gpu(void *arg)
        struct drm_i915_private *i915 = arg;
        struct drm_i915_gem_object *obj;
        struct i915_gem_context *ctx;
-       struct drm_file *file;
+       struct file *file;
        I915_RND_STATE(prng);
        u32 sz;
        int err;
@@ -439,7 +439,7 @@ static int igt_lmem_write_gpu(void *arg)
 out_put:
        i915_gem_object_put(obj);
 out_file:
-       mock_file_put(file);
+       fput(file);
        return err;
 }
 

diff --git a/drivers/gpu/drm/i915/selftests/mock_drm.c b/drivers/gpu/drm/i915/selftests/mock_drm.c
deleted file mode 100644 (file)
index c100c3e..0000000
--- a/drivers/gpu/drm/i915/selftests/mock_drm.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright © 2017 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- *
- */
-
-#include <drm/drm_file.h>
-
-#include "mock_drm.h"
-
-struct drm_file *mock_file(struct drm_i915_private *i915)
-{
-       struct file *file;
-
-       file = mock_drm_getfile(i915->drm.primary, O_RDWR);
-       if (IS_ERR(file))
-               return ERR_CAST(file);
-
-       return file->private_data;
-}

diff --git a/drivers/gpu/drm/i915/selftests/mock_drm.h b/drivers/gpu/drm/i915/selftests/mock_drm.h
index dc4190bd3f5ae42061919b77e22ad174e73829de..d7f49e149f0c067d32ee8db0d0df5d42fdb3c85f 100644 (file)
--- a/drivers/gpu/drm/i915/selftests/mock_drm.h
+++ b/drivers/gpu/drm/i915/selftests/mock_drm.h
@@ -25,13 +25,20 @@
 #ifndef __MOCK_DRM_H
 #define __MOCK_DRM_H
 
-struct drm_file;
+#include <drm/drm_file.h>
+
 struct drm_i915_private;
+struct drm_file;
+struct file;
+
+static inline struct file *mock_file(struct drm_i915_private *i915)
+{
+       return mock_drm_getfile(i915->drm.primary, O_RDWR);
+}
 
-struct drm_file *mock_file(struct drm_i915_private *i915);
-static inline void mock_file_put(struct drm_file *file)
+static inline struct drm_file *to_drm_file(struct file *f)
 {
-       fput(file->filp);
+       return f->private_data;
 }
 
 #endif /* !__MOCK_DRM_H */