diff options
| author |   Chris Wilson <chris@chris-wilson.co.uk> | 2021-01-19 21:43:33 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2021-01-20 20:46:36 +0000 |
| commit | 41a9c75d0acf23f33f012d3f9535de9e9b631051 (patch) | |
| tree | 02bc06ec4211dc971c6df25c2dcb7fe42754184d /drivers/gpu/drm/i915/gem/i915_gem_object_types.h | |
| parent | drm/i915/gem: Almagamate clflushes on freeze (diff) | |
| download | linux-dev-41a9c75d0acf23f33f012d3f9535de9e9b631051.tar.xz linux-dev-41a9c75d0acf23f33f012d3f9535de9e9b631051.zip | |
drm/i915/gem: Move stolen node into GEM object union
The obj->stolen is currently used to identify an object allocated from
stolen memory. This dates back to when there were just 1.5 types of
objects, an object backed by shmemfs and an object backed by shmemfs
with a contiguous physical address. Now that we have several different
types of objects, we no longer want to treat stolen objects as a special
case.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210119214336.1463-3-chris@chris-wilson.co.uk
Diffstat (limited to 'drivers/gpu/drm/i915/gem/i915_gem_object_types.h')
| -rw-r--r-- | drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object_types.h b/drivers/gpu/drm/i915/gem/i915_gem_object_types.h index ab55b7bb9ca6..217151c18d49 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_object_types.h +++ b/drivers/gpu/drm/i915/gem/i915_gem_object_types.h @@ -150,8 +150,6 @@ struct drm_i915_gem_object { */ struct list_head obj_link; - /** Stolen memory for this object, instead of being backed by shmem. */ - struct drm_mm_node *stolen; union { struct rcu_head rcu; struct llist_node freed; @@ -303,6 +301,8 @@ struct drm_i915_gem_object { struct work_struct *work; } userptr; + struct drm_mm_node *stolen; + unsigned long scratch; u64 encode; |