drm/i915: Prevent lock-cycles between GPU waits and GPU resets

[linux-2.6-microblaze.git] / drivers / gpu / drm / i915 / selftests / mock_gem_device.c

diff --git a/drivers/gpu/drm/i915/selftests/mock_gem_device.c b/drivers/gpu/drm/i915/selftests/mock_gem_device.c
index b7f3fbb..1e9ffce 100644 (file)
--- a/drivers/gpu/drm/i915/selftests/mock_gem_device.c
+++ b/drivers/gpu/drm/i915/selftests/mock_gem_device.c
@@ -130,6 +130,7 @@ static struct dev_pm_domain pm_domain = {
 
 struct drm_i915_private *mock_gem_device(void)
 {
+       static struct lock_class_key reset_key;
        struct drm_i915_private *i915;
        struct pci_dev *pdev;
        int err;
@@ -204,6 +205,7 @@ struct drm_i915_private *mock_gem_device(void)
        INIT_LIST_HEAD(&i915->gt.active_rings);
        INIT_LIST_HEAD(&i915->gt.closed_vma);
        spin_lock_init(&i915->gt.closed_lock);
+       lockdep_init_map(&i915->gt.reset_lockmap, "i915.reset", &reset_key, 0);
 
        mutex_lock(&i915->drm.struct_mutex);