Commit f0c02c1b authored by Tvrtko Ursulin's avatar Tvrtko Ursulin
Browse files

drm/i915: Rename i915_timeline to intel_timeline and move under gt 



Move all timeline code under gt and rename to intel_gt prefix.

Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Suggested-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190621070811.7006-32-tvrtko.ursulin@linux.intel.com
parent 4c6d51ea

drivers/gpu/drm/i915/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ gt-y += \ 
	gt/intel_ringbuffer.o \

	gt/intel_mocs.o \

	gt/intel_sseu.o \

	gt/intel_timeline.o \

	gt/intel_workarounds.o

gt-$(CONFIG_DRM_I915_SELFTEST) += \

	gt/mock_engine.o
@@ -127,7 +128,6 @@ i915-y += \ 
	  i915_query.o \

	  i915_request.o \

	  i915_scheduler.o \

	  i915_timeline.o \

	  i915_trace_points.o \

	  i915_vma.o \

	  intel_wopcm.o

drivers/gpu/drm/i915/Makefile.header-test

+0 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ header_test := \ 
	i915_priolist_types.h \

	i915_reg.h \

	i915_scheduler_types.h \

	i915_timeline_types.h \

	i915_utils.h \

	intel_csr.h \

	intel_drv.h \

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

+5 −5
Original line number Diff line number Diff line
@@ -316,7 +316,7 @@ static void i915_gem_context_free(struct i915_gem_context *ctx) 
	mutex_destroy(&ctx->engines_mutex);



	if (ctx->timeline)

		i915_timeline_put(ctx->timeline);

		intel_timeline_put(ctx->timeline);



	kfree(ctx->name);

	put_pid(ctx->pid);
@@ -528,9 +528,9 @@ i915_gem_create_context(struct drm_i915_private *dev_priv, unsigned int flags) 
	}



	if (flags & I915_CONTEXT_CREATE_FLAGS_SINGLE_TIMELINE) {

		struct i915_timeline *timeline;

		struct intel_timeline *timeline;



		timeline = i915_timeline_create(&dev_priv->gt, NULL);

		timeline = intel_timeline_create(&dev_priv->gt, NULL);

		if (IS_ERR(timeline)) {

			context_close(ctx);

			return ERR_CAST(timeline);
@@ -2015,8 +2015,8 @@ static int clone_timeline(struct i915_gem_context *dst, 
		GEM_BUG_ON(src->timeline == dst->timeline);



		if (dst->timeline)

			i915_timeline_put(dst->timeline);

		dst->timeline = i915_timeline_get(src->timeline);

			intel_timeline_put(dst->timeline);

		dst->timeline = intel_timeline_get(src->timeline);

	}



	return 0;

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

+2 −2
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ struct pid; 
struct drm_i915_private;

struct drm_i915_file_private;

struct i915_address_space;

struct i915_timeline;

struct intel_timeline;

struct intel_ring;



struct i915_gem_engines {
@@ -77,7 +77,7 @@ struct i915_gem_context { 
	struct i915_gem_engines __rcu *engines;

	struct mutex engines_mutex; /* guards writes to engines */



	struct i915_timeline *timeline;

	struct intel_timeline *timeline;



	/**

	 * @vm: unique address space (GTT)

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

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ static void i915_gem_park(struct drm_i915_private *i915) 
		i915_gem_batch_pool_fini(&engine->batch_pool);

	}



	i915_timelines_park(i915);

	intel_timelines_park(i915);

	i915_vma_parked(i915);



	i915_globals_park();