mirror of
git://git.yoctoproject.org/linux-yocto.git
synced 2025-10-23 07:23:12 +02:00
drm/i915: Remove deadcode
i915_active_acquire_for_context() was added in 2020 by commit5d9341370f
("drm/i915: Export a preallocate variant of i915_active_acquire()") but has never been used. The last use of __i915_gem_object_is_lmem() was removed in 2021 by commitff20afc4ce
("drm/i915: Update error capture code to avoid using the current vma state") Remove them. Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org> Signed-off-by: Tvrtko Ursulin <tursulin@igalia.com> Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com> Signed-off-by: Andi Shyti <andi.shyti@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20241227113754.25871-1-tursulin@igalia.com
This commit is contained in:
parent
835443da6f
commit
bc6b027e6d
|
@ -52,29 +52,6 @@ bool i915_gem_object_is_lmem(struct drm_i915_gem_object *obj)
|
|||
mr->type == INTEL_MEMORY_STOLEN_LOCAL);
|
||||
}
|
||||
|
||||
/**
|
||||
* __i915_gem_object_is_lmem - Whether the object is resident in
|
||||
* lmem while in the fence signaling critical path.
|
||||
* @obj: The object to check.
|
||||
*
|
||||
* This function is intended to be called from within the fence signaling
|
||||
* path where the fence, or a pin, keeps the object from being migrated. For
|
||||
* example during gpu reset or similar.
|
||||
*
|
||||
* Return: Whether the object is resident in lmem.
|
||||
*/
|
||||
bool __i915_gem_object_is_lmem(struct drm_i915_gem_object *obj)
|
||||
{
|
||||
struct intel_memory_region *mr = READ_ONCE(obj->mm.region);
|
||||
|
||||
#ifdef CONFIG_LOCKDEP
|
||||
GEM_WARN_ON(dma_resv_test_signaled(obj->base.resv, DMA_RESV_USAGE_BOOKKEEP) &&
|
||||
i915_gem_object_evictable(obj));
|
||||
#endif
|
||||
return mr && (mr->type == INTEL_MEMORY_LOCAL ||
|
||||
mr->type == INTEL_MEMORY_STOLEN_LOCAL);
|
||||
}
|
||||
|
||||
/**
|
||||
* __i915_gem_object_create_lmem_with_ps - Create lmem object and force the
|
||||
* minimum page size for the backing pages.
|
||||
|
|
|
@ -19,8 +19,6 @@ i915_gem_object_lmem_io_map(struct drm_i915_gem_object *obj,
|
|||
|
||||
bool i915_gem_object_is_lmem(struct drm_i915_gem_object *obj);
|
||||
|
||||
bool __i915_gem_object_is_lmem(struct drm_i915_gem_object *obj);
|
||||
|
||||
struct drm_i915_gem_object *
|
||||
i915_gem_object_create_lmem_from_data(struct drm_i915_private *i915,
|
||||
const void *data, size_t size);
|
||||
|
|
|
@ -527,24 +527,6 @@ int i915_active_acquire(struct i915_active *ref)
|
|||
return err;
|
||||
}
|
||||
|
||||
int i915_active_acquire_for_context(struct i915_active *ref, u64 idx)
|
||||
{
|
||||
struct i915_active_fence *active;
|
||||
int err;
|
||||
|
||||
err = i915_active_acquire(ref);
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
active = active_instance(ref, idx);
|
||||
if (!active) {
|
||||
i915_active_release(ref);
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
return 0; /* return with active ref */
|
||||
}
|
||||
|
||||
void i915_active_release(struct i915_active *ref)
|
||||
{
|
||||
debug_active_assert(ref);
|
||||
|
|
|
@ -186,7 +186,6 @@ int i915_request_await_active(struct i915_request *rq,
|
|||
#define I915_ACTIVE_AWAIT_BARRIER BIT(2)
|
||||
|
||||
int i915_active_acquire(struct i915_active *ref);
|
||||
int i915_active_acquire_for_context(struct i915_active *ref, u64 idx);
|
||||
bool i915_active_acquire_if_busy(struct i915_active *ref);
|
||||
|
||||
void i915_active_release(struct i915_active *ref);
|
||||
|
|
Loading…
Reference in New Issue
Block a user