Commit d83d5298 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915: move i915_gem_vm_lookup() where it's used 



Move the function next to the only user. Arguably it's perhaps not the
best place, but it's much better than having a static inline in a
header.

Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Acked-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/a080e401840a8b9d45946ff33fd63c7939a623ae.1644507885.git.jani.nikula@intel.com
parent 74fc5954

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

+14 −0
Original line number Diff line number Diff line
@@ -343,6 +343,20 @@ static int proto_context_register(struct drm_i915_file_private *fpriv, 
	return ret;

}



static struct i915_address_space *

i915_gem_vm_lookup(struct drm_i915_file_private *file_priv, u32 id)

{

	struct i915_address_space *vm;



	xa_lock(&file_priv->vm_xa);

	vm = xa_load(&file_priv->vm_xa, id);

	if (vm)

		kref_get(&vm->ref);

	xa_unlock(&file_priv->vm_xa);



	return vm;

}



static int set_proto_ctx_vm(struct drm_i915_file_private *fpriv,

			    struct i915_gem_proto_context *pc,

			    const struct drm_i915_gem_context_param *args)

drivers/gpu/drm/i915/i915_drv.h

+0 −14
Original line number Diff line number Diff line
@@ -1618,20 +1618,6 @@ void i915_gem_driver_release(struct drm_i915_private *dev_priv); 


int i915_gem_open(struct drm_i915_private *i915, struct drm_file *file);



static inline struct i915_address_space *

i915_gem_vm_lookup(struct drm_i915_file_private *file_priv, u32 id)

{

	struct i915_address_space *vm;



	xa_lock(&file_priv->vm_xa);

	vm = xa_load(&file_priv->vm_xa, id);

	if (vm)

		kref_get(&vm->ref);

	xa_unlock(&file_priv->vm_xa);



	return vm;

}



/* i915_gem_tiling.c */

static inline bool i915_gem_object_needs_bit17_swizzle(struct drm_i915_gem_object *obj)

{