diff options
| author |   Maarten Lankhorst <maarten.lankhorst@linux.intel.com> | 2021-11-17 14:20:20 +0000 |
|---|---|---|
| committer |   Matthew Auld <matthew.auld@intel.com> | 2021-11-19 17:38:03 +0000 |
| commit | b0b0f2d225da6fe58417fae37e3f797e2db27b62 (patch) | |
| tree | ab73b9c99dc5fee180af0f221532fb4aafcf6b77 /drivers/gpu/drm/i915/i915_drv.h | |
| parent | drm/i915: move the pre_pin earlier (diff) | |
| download | linux-dev-b0b0f2d225da6fe58417fae37e3f797e2db27b62.tar.xz linux-dev-b0b0f2d225da6fe58417fae37e3f797e2db27b62.zip | |
drm/i915: Create a dummy object for gen6 ppgtt
We currently have to special case vma->obj being NULL because
of gen6 ppgtt and mock_engine. Fix gen6 ppgtt, so we may soon
be able to remove a few checks. As the object only exists as
a fake object pointing to ggtt, we have no backing storage,
so no real object is created. It just has to look real enough.
Also kill pin_mutex, it's not compatible with ww locking,
and we can use the vm lock instead.
v2:
- Drop IS_SHRINKABLE and shorten overly long line
v3:
- Checkpatch fix for alignment
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20211117142024.1043017-2-matthew.auld@intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.h')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index eac6382f7be0..5213cad79bed 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -1936,6 +1936,10 @@ int i915_gem_evict_vm(struct i915_address_space *vm); struct drm_i915_gem_object * i915_gem_object_create_internal(struct drm_i915_private *dev_priv, phys_addr_t size); +struct drm_i915_gem_object * +__i915_gem_object_create_internal(struct drm_i915_private *dev_priv, + const struct drm_i915_gem_object_ops *ops, + phys_addr_t size); /* i915_gem_tiling.c */ static inline bool i915_gem_object_needs_bit17_swizzle(struct drm_i915_gem_object *obj) |