aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2017-11-27 07:30:54 -0500
committerChris Wilson <chris@chris-wilson.co.uk>2017-11-27 11:37:15 -0500
commitd02a1d830880b611000aaa0df8a8d7aabf1d8718 (patch)
tree6864400faf03ecb66d6f0f78d072e9643f611f56
parent56fa4bf2b2f08405739a9166f306ceaea421447f (diff)
drm/i915: Rename i915_gem_timelines_mark_idle
The kerneldoc markup for i915_gem_timelines_mark_idle() was incorrect, so take the opportunity to also convert it from the "mark_idle" to "park" naming scheme. drivers/gpu/drm/i915/i915_gem_timeline.c:120: warning: No description found for parameter 'i915' Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20171127123054.20966-1-chris@chris-wilson.co.uk Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
-rw-r--r--drivers/gpu/drm/i915/i915_gem.c3
-rw-r--r--drivers/gpu/drm/i915/i915_gem_timeline.c6
-rw-r--r--drivers/gpu/drm/i915/i915_gem_timeline.h2
3 files changed, 6 insertions, 5 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index e03d6c2554e2..354b0546a191 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -3371,7 +3371,8 @@ i915_gem_idle_work_handler(struct work_struct *work)
3371 synchronize_irq(dev_priv->drm.irq); 3371 synchronize_irq(dev_priv->drm.irq);
3372 3372
3373 intel_engines_park(dev_priv); 3373 intel_engines_park(dev_priv);
3374 i915_gem_timelines_mark_idle(dev_priv); 3374 i915_gem_timelines_park(dev_priv);
3375
3375 i915_pmu_gt_parked(dev_priv); 3376 i915_pmu_gt_parked(dev_priv);
3376 3377
3377 GEM_BUG_ON(!dev_priv->gt.awake); 3378 GEM_BUG_ON(!dev_priv->gt.awake);
diff --git a/drivers/gpu/drm/i915/i915_gem_timeline.c b/drivers/gpu/drm/i915/i915_gem_timeline.c
index c597ce277a04..c01905d6450c 100644
--- a/drivers/gpu/drm/i915/i915_gem_timeline.c
+++ b/drivers/gpu/drm/i915/i915_gem_timeline.c
@@ -107,8 +107,8 @@ int i915_gem_timeline_init__global(struct drm_i915_private *i915)
107} 107}
108 108
109/** 109/**
110 * i915_gem_timelines_mark_idle -- called when the driver idles 110 * i915_gem_timelines_park - called when the driver idles
111 * @i915 - the drm_i915_private device 111 * @i915: the drm_i915_private device
112 * 112 *
113 * When the driver is completely idle, we know that all of our sync points 113 * When the driver is completely idle, we know that all of our sync points
114 * have been signaled and our tracking is then entirely redundant. Any request 114 * have been signaled and our tracking is then entirely redundant. Any request
@@ -116,7 +116,7 @@ int i915_gem_timeline_init__global(struct drm_i915_private *i915)
116 * the fence is signaled and therefore we will not even look them up in the 116 * the fence is signaled and therefore we will not even look them up in the
117 * sync point map. 117 * sync point map.
118 */ 118 */
119void i915_gem_timelines_mark_idle(struct drm_i915_private *i915) 119void i915_gem_timelines_park(struct drm_i915_private *i915)
120{ 120{
121 struct i915_gem_timeline *timeline; 121 struct i915_gem_timeline *timeline;
122 int i; 122 int i;
diff --git a/drivers/gpu/drm/i915/i915_gem_timeline.h b/drivers/gpu/drm/i915/i915_gem_timeline.h
index bfb5eb94c64d..b5a22400a01f 100644
--- a/drivers/gpu/drm/i915/i915_gem_timeline.h
+++ b/drivers/gpu/drm/i915/i915_gem_timeline.h
@@ -93,7 +93,7 @@ int i915_gem_timeline_init(struct drm_i915_private *i915,
93 struct i915_gem_timeline *tl, 93 struct i915_gem_timeline *tl,
94 const char *name); 94 const char *name);
95int i915_gem_timeline_init__global(struct drm_i915_private *i915); 95int i915_gem_timeline_init__global(struct drm_i915_private *i915);
96void i915_gem_timelines_mark_idle(struct drm_i915_private *i915); 96void i915_gem_timelines_park(struct drm_i915_private *i915);
97void i915_gem_timeline_fini(struct i915_gem_timeline *tl); 97void i915_gem_timeline_fini(struct i915_gem_timeline *tl);
98 98
99static inline int __intel_timeline_sync_set(struct intel_timeline *tl, 99static inline int __intel_timeline_sync_set(struct intel_timeline *tl,