drm/i915/dgfx: Grab wakeref at i915_ttm_unmap_virtual

Browse source

[ Upstream commit 1cacd6894d ]

We had already grabbed the rpm wakeref at obj destruction path,
but it also required to grab the wakeref when object moves.
When i915_gem_object_release_mmap_offset() gets called by
i915_ttm_move_notify(), it will release the mmap offset without
grabbing the wakeref. We want to avoid that therefore,
grab the wakeref at i915_ttm_unmap_virtual() accordingly.

While doing that also changed the lmem_userfault_lock from
mutex to spinlock, as spinlock widely used for list.

Also changed if (obj->userfault_count) to
GEM_BUG_ON(!obj->userfault_count).

v2:
- Removed lmem_userfault_{list,lock} from intel_gt. [Matt Auld]

Fixes: ad74457a6b ("drm/i915/dgfx: Release mmap on rpm suspend")
Suggested-by: Matthew Auld <matthew.auld@intel.com>
Signed-off-by: Anshuman Gupta <anshuman.gupta@intel.com>
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221027092242.1476080-3-anshuman.gupta@intel.com
Signed-off-by: Sasha Levin <sashal@kernel.org>

...

This commit is contained in:

Anshuman Gupta 2022-10-27 14:52:42 +05:30 • committed by Greg Kroah-Hartman

parent 6039c79ea5

commit bd449cadc8

4 changed files with 35 additions and 26 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

19

drivers/gpu/drm/i915/gem/i915_gem_mman.c

View file

38

drivers/gpu/drm/i915/gem/i915_gem_ttm.c

View file

2

drivers/gpu/drm/i915/intel_runtime_pm.c

View file

2

drivers/gpu/drm/i915/intel_runtime_pm.h

View file