Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/i915/selftest: Create mock_destroy_device

Just some prep work before we rework the lifetime handling, which
requires replacing all the drm_dev_put in selftests by something else.

v2: Don't go with a static inline, upsets the header tests and
separation.

Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200918132505.2316382-2-daniel.vetter@ffwll.ch

+19 -12
+1 -1
drivers/gpu/drm/i915/gem/selftests/huge_pages.c
··· 1617 1617 out_put: 1618 1618 i915_vm_put(&ppgtt->vm); 1619 1619 out_unlock: 1620 - drm_dev_put(&dev_priv->drm); 1620 + mock_destroy_device(dev_priv); 1621 1621 return err; 1622 1622 } 1623 1623
+1 -1
drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c
··· 1997 1997 1998 1998 err = i915_subtests(tests, i915); 1999 1999 2000 - drm_dev_put(&i915->drm); 2000 + mock_destroy_device(i915); 2001 2001 return err; 2002 2002 } 2003 2003
+1 -1
drivers/gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c
··· 272 272 273 273 err = i915_subtests(tests, i915); 274 274 275 - drm_dev_put(&i915->drm); 275 + mock_destroy_device(i915); 276 276 return err; 277 277 } 278 278
+1 -1
drivers/gpu/drm/i915/gem/selftests/i915_gem_object.c
··· 85 85 86 86 err = i915_subtests(tests, i915); 87 87 88 - drm_dev_put(&i915->drm); 88 + mock_destroy_device(i915); 89 89 return err; 90 90 } 91 91
+1 -1
drivers/gpu/drm/i915/gem/selftests/i915_gem_phys.c
··· 73 73 74 74 err = i915_subtests(tests, i915); 75 75 76 - drm_dev_put(&i915->drm); 76 + mock_destroy_device(i915); 77 77 return err; 78 78 }
+1 -1
drivers/gpu/drm/i915/gt/selftest_timeline.c
··· 158 158 __mock_hwsp_record(&state, na, NULL); 159 159 kfree(state.history); 160 160 err_put: 161 - drm_dev_put(&i915->drm); 161 + mock_destroy_device(i915); 162 162 return err; 163 163 } 164 164
+1 -1
drivers/gpu/drm/i915/selftests/i915_gem_evict.c
··· 536 536 with_intel_runtime_pm(&i915->runtime_pm, wakeref) 537 537 err = i915_subtests(tests, &i915->gt); 538 538 539 - drm_dev_put(&i915->drm); 539 + mock_destroy_device(i915); 540 540 return err; 541 541 } 542 542
+1 -1
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
··· 1727 1727 mock_fini_ggtt(ggtt); 1728 1728 kfree(ggtt); 1729 1729 out_put: 1730 - drm_dev_put(&i915->drm); 1730 + mock_destroy_device(i915); 1731 1731 return err; 1732 1732 } 1733 1733
+1 -1
drivers/gpu/drm/i915/selftests/i915_request.c
··· 527 527 with_intel_runtime_pm(&i915->runtime_pm, wakeref) 528 528 err = i915_subtests(tests, i915); 529 529 530 - drm_dev_put(&i915->drm); 530 + mock_destroy_device(i915); 531 531 532 532 return err; 533 533 }
+1 -1
drivers/gpu/drm/i915/selftests/i915_vma.c
··· 841 841 mock_fini_ggtt(ggtt); 842 842 kfree(ggtt); 843 843 out_put: 844 - drm_dev_put(&i915->drm); 844 + mock_destroy_device(i915); 845 845 return err; 846 846 } 847 847
+1 -1
drivers/gpu/drm/i915/selftests/intel_memory_region.c
··· 791 791 792 792 intel_memory_region_put(mem); 793 793 out_unref: 794 - drm_dev_put(&i915->drm); 794 + mock_destroy_device(i915); 795 795 return err; 796 796 } 797 797
+6 -1
drivers/gpu/drm/i915/selftests/mock_gem_device.c
··· 224 224 intel_gt_driver_late_release(&i915->gt); 225 225 intel_memory_regions_driver_release(i915); 226 226 drm_mode_config_cleanup(&i915->drm); 227 - drm_dev_put(&i915->drm); 227 + mock_destroy_device(i915); 228 228 229 229 return NULL; 230 + } 231 + 232 + void mock_destroy_device(struct drm_i915_private *i915) 233 + { 234 + drm_dev_put(&i915->drm); 230 235 }
+2
drivers/gpu/drm/i915/selftests/mock_gem_device.h
··· 7 7 struct drm_i915_private *mock_gem_device(void); 8 8 void mock_device_flush(struct drm_i915_private *i915); 9 9 10 + void mock_destroy_device(struct drm_i915_private *i915); 11 + 10 12 #endif /* !__MOCK_GEM_DEVICE_H__ */