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

drm/i915/gem: unify i915 gem object frontbuffer function names 



Many of the i915 gem object frontbuffer function names follow the file
name as prefix. Follow suit with the remaining functions, renaming them
i915_gem_object_frontbuffer_*().

Reviewed-by: default avatarJouni Högander <jouni.hogander@intel.com>
Link: https://patch.msgid.link/3415b59497f2c3a79586600d259eeaf58be73498.1772475391.git.jani.nikula@intel.com


Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 8828edab

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

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ static void __do_clflush(struct drm_i915_gem_object *obj) 
	GEM_BUG_ON(!i915_gem_object_has_pages(obj));

	drm_clflush_sg(obj->mm.pages);



	i915_gem_object_flush_frontbuffer(obj, ORIGIN_CPU);

	i915_gem_object_frontbuffer_flush(obj, ORIGIN_CPU);

}



static void clflush_work(struct dma_fence_work *base)

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

+3 −3
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ flush_write_domain(struct drm_i915_gem_object *obj, unsigned int flush_domains) 
			i915_vma_flush_writes(vma);

		spin_unlock(&obj->vma.lock);



		i915_gem_object_flush_frontbuffer(obj, ORIGIN_CPU);

		i915_gem_object_frontbuffer_flush(obj, ORIGIN_CPU);

		break;



	case I915_GEM_DOMAIN_WC:
@@ -647,7 +647,7 @@ i915_gem_set_domain_ioctl(struct drm_device *dev, void *data, 
	i915_gem_object_unlock(obj);



	if (!err && write_domain)

		i915_gem_object_invalidate_frontbuffer(obj, ORIGIN_CPU);

		i915_gem_object_frontbuffer_invalidate(obj, ORIGIN_CPU);



out:

	i915_gem_object_put(obj);
@@ -759,7 +759,7 @@ int i915_gem_object_prepare_write(struct drm_i915_gem_object *obj, 
	}



out:

	i915_gem_object_invalidate_frontbuffer(obj, ORIGIN_CPU);

	i915_gem_object_frontbuffer_invalidate(obj, ORIGIN_CPU);

	obj->mm.dirty = true;

	/* return with the pages pinned */

	return 0;

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

+2 −2
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ void i915_gem_object_frontbuffer_put(struct i915_frontbuffer *front) 
		      &i915->frontbuffer_lock);

}



void __i915_gem_object_flush_frontbuffer(struct drm_i915_gem_object *obj,

void __i915_gem_object_frontbuffer_flush(struct drm_i915_gem_object *obj,

					 enum fb_op_origin origin)

{

	struct i915_frontbuffer *front;
@@ -114,7 +114,7 @@ void __i915_gem_object_flush_frontbuffer(struct drm_i915_gem_object *obj, 
	}

}



void __i915_gem_object_invalidate_frontbuffer(struct drm_i915_gem_object *obj,

void __i915_gem_object_frontbuffer_invalidate(struct drm_i915_gem_object *obj,

					      enum fb_op_origin origin)

{

	struct i915_frontbuffer *front;

drivers/gpu/drm/i915/gem/i915_gem_object_frontbuffer.h

+6 −6
Original line number Diff line number Diff line
@@ -20,25 +20,25 @@ struct i915_frontbuffer { 
	struct kref ref;

};



void __i915_gem_object_flush_frontbuffer(struct drm_i915_gem_object *obj,

void __i915_gem_object_frontbuffer_flush(struct drm_i915_gem_object *obj,

					 enum fb_op_origin origin);

void __i915_gem_object_invalidate_frontbuffer(struct drm_i915_gem_object *obj,

void __i915_gem_object_frontbuffer_invalidate(struct drm_i915_gem_object *obj,

					      enum fb_op_origin origin);



static inline void

i915_gem_object_flush_frontbuffer(struct drm_i915_gem_object *obj,

i915_gem_object_frontbuffer_flush(struct drm_i915_gem_object *obj,

				  enum fb_op_origin origin)

{

	if (unlikely(rcu_access_pointer(obj->frontbuffer)))

		__i915_gem_object_flush_frontbuffer(obj, origin);

		__i915_gem_object_frontbuffer_flush(obj, origin);

}



static inline void

i915_gem_object_invalidate_frontbuffer(struct drm_i915_gem_object *obj,

i915_gem_object_frontbuffer_invalidate(struct drm_i915_gem_object *obj,

				       enum fb_op_origin origin)

{

	if (unlikely(rcu_access_pointer(obj->frontbuffer)))

		__i915_gem_object_invalidate_frontbuffer(obj, origin);

		__i915_gem_object_frontbuffer_invalidate(obj, origin);

}



struct i915_frontbuffer *i915_gem_object_frontbuffer_get(struct drm_i915_gem_object *obj);

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

+2 −2
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ int i915_gem_object_pwrite_phys(struct drm_i915_gem_object *obj, 
	 * We manually control the domain here and pretend that it

	 * remains coherent i.e. in the GTT domain, like shmem_pwrite.

	 */

	i915_gem_object_invalidate_frontbuffer(obj, ORIGIN_CPU);

	i915_gem_object_frontbuffer_invalidate(obj, ORIGIN_CPU);



	if (copy_from_user(vaddr, user_data, args->size))

		return -EFAULT;
@@ -163,7 +163,7 @@ int i915_gem_object_pwrite_phys(struct drm_i915_gem_object *obj, 
	drm_clflush_virt_range(vaddr, args->size);

	intel_gt_chipset_flush(to_gt(i915));



	i915_gem_object_flush_frontbuffer(obj, ORIGIN_CPU);

	i915_gem_object_frontbuffer_flush(obj, ORIGIN_CPU);

	return 0;

}