diff options
| author | Dave Airlie <airlied@redhat.com> | 2020-10-15 11:21:49 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2020-10-15 11:21:49 +1000 |
| commit | b24fdd4b3830f77ff71c09eaec6a617e88abe419 (patch) | |
| tree | 123628b3c27646c5ae7dbbdf3ad7e4a041f75916 /drivers/gpu/drm/i915/gem/selftests/i915_gem_object.c | |
| parent | 029f56db6ac248769f2c260bfaf3c3c0e23e904c (diff) | |
| parent | 640eee067d9aae0bb98d8706001976ff1affaf00 (diff) | |
Merge branch 'drm-next' of git://anongit.freedesktop.org/git/drm/drmdrm-next-5.10-merged
Conflict resolution temp branch
Diffstat (limited to 'drivers/gpu/drm/i915/gem/selftests/i915_gem_object.c')
| -rw-r--r-- | drivers/gpu/drm/i915/gem/selftests/i915_gem_object.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_object.c b/drivers/gpu/drm/i915/gem/selftests/i915_gem_object.c index faa5b6d91795..bf853c40ec65 100644 --- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_object.c +++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_object.c @@ -85,7 +85,7 @@ int i915_gem_object_mock_selftests(void) err = i915_subtests(tests, i915); - drm_dev_put(&i915->drm); + mock_destroy_device(i915); return err; } |