Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d02a1d83 authored by Chris Wilson's avatar Chris Wilson
Browse files

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: default avatarChris 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: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
parent 56fa4bf2

drivers/gpu/drm/i915/i915_gem.c

+2 −1
Original line number Diff line number Diff line
@@ -3371,7 +3371,8 @@ i915_gem_idle_work_handler(struct work_struct *work) 
	synchronize_irq(dev_priv->drm.irq);



	intel_engines_park(dev_priv);

	i915_gem_timelines_mark_idle(dev_priv);

	i915_gem_timelines_park(dev_priv);



	i915_pmu_gt_parked(dev_priv);



	GEM_BUG_ON(!dev_priv->gt.awake);

drivers/gpu/drm/i915/i915_gem_timeline.c

+3 −3
Original line number Diff line number Diff line
@@ -107,8 +107,8 @@ int i915_gem_timeline_init__global(struct drm_i915_private *i915) 
}



/**

 * i915_gem_timelines_mark_idle -- called when the driver idles

 * @i915 - the drm_i915_private device

 * i915_gem_timelines_park - called when the driver idles

 * @i915: the drm_i915_private device

 *

 * When the driver is completely idle, we know that all of our sync points

 * 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) 
 * the fence is signaled and therefore we will not even look them up in the

 * sync point map.

 */

void i915_gem_timelines_mark_idle(struct drm_i915_private *i915)

void i915_gem_timelines_park(struct drm_i915_private *i915)

{

	struct i915_gem_timeline *timeline;

	int i;

drivers/gpu/drm/i915/i915_gem_timeline.h

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ int i915_gem_timeline_init(struct drm_i915_private *i915, 
			   struct i915_gem_timeline *tl,

			   const char *name);

int i915_gem_timeline_init__global(struct drm_i915_private *i915);

void i915_gem_timelines_mark_idle(struct drm_i915_private *i915);

void i915_gem_timelines_park(struct drm_i915_private *i915);

void i915_gem_timeline_fini(struct i915_gem_timeline *tl);



static inline int __intel_timeline_sync_set(struct intel_timeline *tl,