From: "Thomas Hellström" <thomas.hellstrom@linux.intel.com>
To: intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org
Cc: maarten.lankhorst@linux.intel.com, matthew.auld@intel.com,
"Thomas Hellström" <thomas.hellstrom@linux.intel.com>
Subject: [Intel-gfx] [PATCH 2/3] drm/i915/ttm: Fix lockdep warning in __i915_gem_free_object()
Date: Wed, 22 Sep 2021 10:38:06 +0200 [thread overview]
Message-ID: <20210922083807.888206-3-thomas.hellstrom@linux.intel.com> (raw)
In-Reply-To: <20210922083807.888206-1-thomas.hellstrom@linux.intel.com>
In the mman selftest, some tests make the ttm_bo_init_reserved() fail,
which may trigger a call to the i915_ttm_bo_destroy() function.
However, at this point the gem object refcount is set to 1, which
triggers a lockdep warning in __i915_gem_free_object() and a
corresponding failure in DG1 BAT, i915_selftest@live@mman.
Fix this by clearing the gem object refcount if called from that
failure path.
Fixes: f9b23c157a78 ("drm/i915: Move __i915_gem_free_object to ttm_bo_destroy")
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
---
drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
index b94497989995..b1f561543ff3 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_ttm.c
@@ -900,6 +900,10 @@ void i915_ttm_bo_destroy(struct ttm_buffer_object *bo)
i915_ttm_backup_free(obj);
+ /* Failure during ttm_bo_init_reserved leaves the refcount set to 1. */
+ if (IS_ENABLED(CONFIG_LOCKDEP) && !obj->ttm.created)
+ refcount_set(&obj->base.refcount.refcount, 0);
+
/* This releases all gem object bindings to the backend. */
__i915_gem_free_object(obj);
--
2.31.1
next prev parent reply other threads:[~2021-09-22 8:38 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-22 8:38 [Intel-gfx] [PATCH 0/3] DG1 Lockdep warning fixes Thomas Hellström
2021-09-22 8:38 ` [Intel-gfx] [PATCH 1/3] drm/i915/gem: Fix a lockdep warning the __i915_gem_is_lmem() function Thomas Hellström
2021-09-22 10:10 ` Matthew Auld
2021-09-22 8:38 ` Thomas Hellström [this message]
2021-09-22 10:55 ` [Intel-gfx] [PATCH 2/3] drm/i915/ttm: Fix lockdep warning in __i915_gem_free_object() Matthew Auld
2021-09-22 11:34 ` Thomas Hellström
2021-09-22 8:38 ` [Intel-gfx] [PATCH 3/3] HAX: component: do not leave master devres group open after bind Thomas Hellström
2021-09-22 9:57 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for DG1 Lockdep warning fixes Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210922083807.888206-3-thomas.hellstrom@linux.intel.com \
--to=thomas.hellstrom@linux.intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=maarten.lankhorst@linux.intel.com \
--cc=matthew.auld@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox