Commit 5f22e5b3 authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Rename intel_wakeref_[is]_active 



Our general rule is to use is/has as the verb for boolean functions,
rename intel_wakeref_active to intel_wakeref_is_active so the question
being asked is clear.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarMatthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190625130128.11009-6-chris@chris-wilson.co.uk
parent 0c91621c

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

+2 −1
Original line number Diff line number Diff line
@@ -54,7 +54,8 @@ static void idle_work_handler(struct work_struct *work) 
	mutex_lock(&i915->drm.struct_mutex);



	intel_wakeref_lock(&i915->gt.wakeref);

	park = !intel_wakeref_active(&i915->gt.wakeref) && !work_pending(work);

	park = (!intel_wakeref_is_active(&i915->gt.wakeref) &&

		!work_pending(work));

	intel_wakeref_unlock(&i915->gt.wakeref);

	if (park)

		i915_gem_park(i915);

drivers/gpu/drm/i915/gt/intel_engine_cs.c

+1 −1
Original line number Diff line number Diff line
@@ -1155,7 +1155,7 @@ bool intel_engine_is_idle(struct intel_engine_cs *engine) 
	if (i915_reset_failed(engine->i915))

		return true;



	if (!intel_wakeref_active(&engine->wakeref))

	if (!intel_engine_pm_is_awake(engine))

		return true;



	/* Waiting to drain ELSP? */

drivers/gpu/drm/i915/gt/intel_engine_pm.h

+9 −0
Original line number Diff line number Diff line
@@ -7,12 +7,21 @@ 
#ifndef INTEL_ENGINE_PM_H

#define INTEL_ENGINE_PM_H



#include "intel_engine_types.h"

#include "intel_wakeref.h"



struct drm_i915_private;

struct intel_engine_cs;



void intel_engine_pm_get(struct intel_engine_cs *engine);

void intel_engine_pm_put(struct intel_engine_cs *engine);



static inline bool

intel_engine_pm_is_awake(const struct intel_engine_cs *engine)

{

	return intel_wakeref_is_active(&engine->wakeref);

}



void intel_engine_park(struct intel_engine_cs *engine);



void intel_engine_init__pm(struct intel_engine_cs *engine);

drivers/gpu/drm/i915/gt/intel_lrc.c

+1 −1
Original line number Diff line number Diff line
@@ -684,7 +684,7 @@ static void execlists_submit_ports(struct intel_engine_cs *engine) 
	 * that all ELSP are drained i.e. we have processed the CSB,

	 * before allowing ourselves to idle and calling intel_runtime_pm_put().

	 */

	GEM_BUG_ON(!intel_wakeref_active(&engine->wakeref));

	GEM_BUG_ON(!intel_engine_pm_is_awake(engine));



	/*

	 * ELSQ note: the submit queue is not cleared after being submitted

drivers/gpu/drm/i915/gt/intel_reset.c

+1 −1
Original line number Diff line number Diff line
@@ -1072,7 +1072,7 @@ int i915_reset_engine(struct intel_engine_cs *engine, const char *msg) 
	GEM_TRACE("%s flags=%lx\n", engine->name, error->flags);

	GEM_BUG_ON(!test_bit(I915_RESET_ENGINE + engine->id, &error->flags));



	if (!intel_wakeref_active(&engine->wakeref))

	if (!intel_engine_pm_is_awake(engine))

		return 0;



	reset_prepare_engine(engine);

CRA Git | Maintained and supported by SUSTech CRA and CCSE