From c6fe28b0c27dfc8103af453ed9723907cd96e3f0 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Fri, 21 Jun 2019 14:16:39 +0100 Subject: [PATCH] drm/i915/gt: Rename i915_gt_timelines Since the anonymous i915_gt became struct intel_gt and encloses struct i915_gt_timelines, rename i915_gt_timelines to intel_gt_timelines to match its parentage. Signed-off-by: Chris Wilson Cc: Tvrtko Ursulin Reviewed-by: Tvrtko Ursulin Link: https://patchwork.freedesktop.org/patch/msgid/20190621131640.28864-1-chris@chris-wilson.co.uk --- drivers/gpu/drm/i915/gt/intel_gt_types.h | 2 +- drivers/gpu/drm/i915/gt/intel_timeline.c | 16 ++++++++-------- drivers/gpu/drm/i915/i915_gem.c | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/i915/gt/intel_gt_types.h b/drivers/gpu/drm/i915/gt/intel_gt_types.h index be891492505d..722506b7cec0 100644 --- a/drivers/gpu/drm/i915/gt/intel_gt_types.h +++ b/drivers/gpu/drm/i915/gt/intel_gt_types.h @@ -25,7 +25,7 @@ struct intel_gt { struct intel_uncore *uncore; struct i915_ggtt *ggtt; - struct i915_gt_timelines { + struct intel_gt_timelines { struct mutex mutex; /* protects list, tainted by GPU */ struct list_head active_list; diff --git a/drivers/gpu/drm/i915/gt/intel_timeline.c b/drivers/gpu/drm/i915/gt/intel_timeline.c index 1a3f04458730..d6accef50f8e 100644 --- a/drivers/gpu/drm/i915/gt/intel_timeline.c +++ b/drivers/gpu/drm/i915/gt/intel_timeline.c @@ -17,7 +17,7 @@ struct intel_timeline_hwsp { struct intel_gt *gt; - struct i915_gt_timelines *gt_timelines; + struct intel_gt_timelines *gt_timelines; struct list_head free_link; struct i915_vma *vma; u64 free_bitmap; @@ -53,7 +53,7 @@ static struct i915_vma *__hwsp_alloc(struct intel_gt *gt) static struct i915_vma * hwsp_alloc(struct intel_timeline *timeline, unsigned int *cacheline) { - struct i915_gt_timelines *gt = &timeline->gt->timelines; + struct intel_gt_timelines *gt = &timeline->gt->timelines; struct intel_timeline_hwsp *hwsp; BUILD_BUG_ON(BITS_PER_TYPE(u64) * CACHELINE_BYTES > PAGE_SIZE); @@ -102,7 +102,7 @@ hwsp_alloc(struct intel_timeline *timeline, unsigned int *cacheline) static void __idle_hwsp_free(struct intel_timeline_hwsp *hwsp, int cacheline) { - struct i915_gt_timelines *gt = hwsp->gt_timelines; + struct intel_gt_timelines *gt = hwsp->gt_timelines; unsigned long flags; spin_lock_irqsave(>->hwsp_lock, flags); @@ -261,7 +261,7 @@ int intel_timeline_init(struct intel_timeline *timeline, static void timelines_init(struct intel_gt *gt) { - struct i915_gt_timelines *timelines = >->timelines; + struct intel_gt_timelines *timelines = >->timelines; mutex_init(&timelines->mutex); INIT_LIST_HEAD(&timelines->active_list); @@ -280,7 +280,7 @@ void intel_timelines_init(struct drm_i915_private *i915) static void timeline_add_to_active(struct intel_timeline *tl) { - struct i915_gt_timelines *gt = &tl->gt->timelines; + struct intel_gt_timelines *gt = &tl->gt->timelines; mutex_lock(>->mutex); list_add(&tl->link, >->active_list); @@ -289,7 +289,7 @@ static void timeline_add_to_active(struct intel_timeline *tl) static void timeline_remove_from_active(struct intel_timeline *tl) { - struct i915_gt_timelines *gt = &tl->gt->timelines; + struct intel_gt_timelines *gt = &tl->gt->timelines; mutex_lock(>->mutex); list_del(&tl->link); @@ -298,7 +298,7 @@ static void timeline_remove_from_active(struct intel_timeline *tl) static void timelines_park(struct intel_gt *gt) { - struct i915_gt_timelines *timelines = >->timelines; + struct intel_gt_timelines *timelines = >->timelines; struct intel_timeline *timeline; mutex_lock(&timelines->mutex); @@ -572,7 +572,7 @@ void __intel_timeline_free(struct kref *kref) static void timelines_fini(struct intel_gt *gt) { - struct i915_gt_timelines *timelines = >->timelines; + struct intel_gt_timelines *timelines = >->timelines; GEM_BUG_ON(!list_empty(&timelines->active_list)); GEM_BUG_ON(!list_empty(&timelines->hwsp_free_list)); diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 8dff3b8f12c3..e59be5c05e1b 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -908,7 +908,7 @@ static long wait_for_timelines(struct drm_i915_private *i915, unsigned int flags, long timeout) { - struct i915_gt_timelines *gt = &i915->gt.timelines; + struct intel_gt_timelines *gt = &i915->gt.timelines; struct intel_timeline *tl; mutex_lock(>->mutex); -- 2.45.2