diff options
| author |   Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2021-03-23 16:49:54 +0100 |
|---|---|---|
| committer |   Daniel Vetter <daniel.vetter@ffwll.ch> | 2021-03-24 11:43:25 +0100 |
| commit | 1eef0de18fc712be7d7cce032e9e2b074ee2e02f (patch) | |
| tree | 81351cd3f34b4fdbb82317bc0cf30179acc12362 /drivers/gpu/drm/i915/gt/intel_renderstate.c | |
| parent | drm/i915: Add missing -EDEADLK handling to execbuf pinning, v2. (diff) | |
| download | linux-dev-1eef0de18fc712be7d7cce032e9e2b074ee2e02f.tar.xz linux-dev-1eef0de18fc712be7d7cce032e9e2b074ee2e02f.zip | |
drm/i915: Ensure we hold the object mutex in pin correctly.
Currently we have a lot of places where we hold the gem object lock,
but haven't yet been converted to the ww dance. Complain loudly about
those places.
i915_vma_pin shouldn't have the obj lock held, so we can do a ww dance,
while i915_vma_pin_ww should.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: Thomas Hellström <thomas.hellstrom@linux.intel.com> #irc
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20210323155059.628690-6-maarten.lankhorst@linux.intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/gt/intel_renderstate.c')
| -rw-r--r-- | drivers/gpu/drm/i915/gt/intel_renderstate.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/gt/intel_renderstate.c b/drivers/gpu/drm/i915/gt/intel_renderstate.c index ca816ba22197..334c557673dd 100644 --- a/drivers/gpu/drm/i915/gt/intel_renderstate.c +++ b/drivers/gpu/drm/i915/gt/intel_renderstate.c @@ -197,7 +197,7 @@ retry: if (err) goto err_context; - err = i915_vma_pin(so->vma, 0, 0, PIN_GLOBAL | PIN_HIGH); + err = i915_vma_pin_ww(so->vma, &so->ww, 0, 0, PIN_GLOBAL | PIN_HIGH); if (err) goto err_context; |