leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/i915: Rename intel_wakeref_[is]_active

Browse Source 
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: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190625130128.11009-6-chris@chris-wilson.co.uk
This commit is contained in:
Chris Wilson 2019-06-25 14:01:14 +01:00
parent 0c91621cad
commit 5f22e5b311
6 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/gpu/drm/i915/gem/i915_gem_pm.c
View File

@ -54,7 +54,8 @@ static void idle_work_handler(struct work_struct *work)
mutex_lock(&i915->drm.struct_mutex); mutex_lock(&i915->drm.struct_mutex);
intel_wakeref_lock(&i915->gt.wakeref); 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); intel_wakeref_unlock(&i915->gt.wakeref);
if (park) if (park)
i915_gem_park(i915); i915_gem_park(i915);

2
drivers/gpu/drm/i915/gt/intel_engine_cs.c
View File

@ -1155,7 +1155,7 @@ bool intel_engine_is_idle(struct intel_engine_cs *engine)
if (i915_reset_failed(engine->i915)) if (i915_reset_failed(engine->i915))
return true; return true;
if (!intel_wakeref_active(&engine->wakeref)) if (!intel_engine_pm_is_awake(engine))
return true; return true;
/* Waiting to drain ELSP? */ /* Waiting to drain ELSP? */

9
drivers/gpu/drm/i915/gt/intel_engine_pm.h
View File

@ -7,12 +7,21 @@
#ifndef INTEL_ENGINE_PM_H #ifndef INTEL_ENGINE_PM_H
#define INTEL_ENGINE_PM_H #define INTEL_ENGINE_PM_H
#include "intel_engine_types.h"
#include "intel_wakeref.h"
struct drm_i915_private; struct drm_i915_private;
struct intel_engine_cs; struct intel_engine_cs;
void intel_engine_pm_get(struct intel_engine_cs *engine); void intel_engine_pm_get(struct intel_engine_cs *engine);
void intel_engine_pm_put(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_park(struct intel_engine_cs *engine);
void intel_engine_init__pm(struct intel_engine_cs *engine); void intel_engine_init__pm(struct intel_engine_cs *engine);

2
drivers/gpu/drm/i915/gt/intel_lrc.c
View File

@ -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, * that all ELSP are drained i.e. we have processed the CSB,
* before allowing ourselves to idle and calling intel_runtime_pm_put(). * 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 * ELSQ note: the submit queue is not cleared after being submitted

2
drivers/gpu/drm/i915/gt/intel_reset.c
View File

@ -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_TRACE("%s flags=%lx\n", engine->name, error->flags);
GEM_BUG_ON(!test_bit(I915_RESET_ENGINE + engine->id, &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; return 0;
reset_prepare_engine(engine); reset_prepare_engine(engine);

4
drivers/gpu/drm/i915/intel_wakeref.h
View File

@ -128,13 +128,13 @@ intel_wakeref_unlock(struct intel_wakeref *wf)
} }
/** /**
* intel_wakeref_active: Query whether the wakeref is currently held * intel_wakeref_is_active: Query whether the wakeref is currently held
* @wf: the wakeref * @wf: the wakeref
* *
* Returns: true if the wakeref is currently held. * Returns: true if the wakeref is currently held.
*/ */
static inline bool static inline bool
intel_wakeref_active(struct intel_wakeref *wf) intel_wakeref_is_active(const struct intel_wakeref *wf)
{ {
return READ_ONCE(wf->wakeref); return READ_ONCE(wf->wakeref);
} }