Skip to content

Commit

Permalink
drm/i915: make intel_wakeref work on the rpm struct
Browse files Browse the repository at this point in the history 
intel_runtime_pm is the only thing they use from the i915 structure,
so use that directly.

Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190613232156.34940-9-daniele.ceraolospurio@intel.com
  • Loading branch information
Daniele Ceraolo Spurio authored and Chris Wilson committed Jun 14, 2019
1 parent c447ff7 commit 58a111f
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 30 deletions.
4 changes: 2 additions & 2 deletions drivers/gpu/drm/i915/gt/intel_engine_pm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ static int __engine_unpark(struct intel_wakeref *wf)

void intel_engine_pm_get(struct intel_engine_cs *engine)
{
intel_wakeref_get(engine->i915, &engine->wakeref, __engine_unpark);
intel_wakeref_get(&engine->i915->runtime_pm, &engine->wakeref, __engine_unpark);
}

void intel_engine_park(struct intel_engine_cs *engine)
Expand Down Expand Up @@ -131,7 +131,7 @@ static int __engine_park(struct intel_wakeref *wf)

void intel_engine_pm_put(struct intel_engine_cs *engine)
{
intel_wakeref_put(engine->i915, &engine->wakeref, __engine_park);
intel_wakeref_put(&engine->i915->runtime_pm, &engine->wakeref, __engine_park);
}

void intel_engine_init__pm(struct intel_engine_cs *engine)
Expand Down
4 changes: 2 additions & 2 deletions drivers/gpu/drm/i915/gt/intel_gt_pm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ static int intel_gt_unpark(struct intel_wakeref *wf)

void intel_gt_pm_get(struct drm_i915_private *i915)
{
intel_wakeref_get(i915, &i915->gt.wakeref, intel_gt_unpark);
intel_wakeref_get(&i915->runtime_pm, &i915->gt.wakeref, intel_gt_unpark);
}

static int intel_gt_park(struct intel_wakeref *wf)
Expand All @@ -77,7 +77,7 @@ static int intel_gt_park(struct intel_wakeref *wf)

void intel_gt_pm_put(struct drm_i915_private *i915)
{
intel_wakeref_put(i915, &i915->gt.wakeref, intel_gt_park);
intel_wakeref_put(&i915->runtime_pm, &i915->gt.wakeref, intel_gt_park);
}

void intel_gt_pm_init(struct drm_i915_private *i915)
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/i915/i915_gem_fence_reg.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -804,7 +804,7 @@ void i915_ggtt_init_fences(struct i915_ggtt *ggtt)

INIT_LIST_HEAD(&ggtt->fence_list);
INIT_LIST_HEAD(&ggtt->userfault_list);
intel_wakeref_auto_init(&ggtt->userfault_wakeref, i915);
intel_wakeref_auto_init(&ggtt->userfault_wakeref, &i915->runtime_pm);

detect_bit_6_swizzle(i915);

Expand Down
32 changes: 16 additions & 16 deletions drivers/gpu/drm/i915/intel_wakeref.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,23 @@
* Copyright © 2019 Intel Corporation
*/

#include "intel_drv.h"
#include "intel_wakeref.h"
#include "intel_runtime_pm.h"
#include "i915_gem.h"

static void rpm_get(struct drm_i915_private *i915, struct intel_wakeref *wf)
static void rpm_get(struct intel_runtime_pm *rpm, struct intel_wakeref *wf)
{
wf->wakeref = intel_runtime_pm_get(&i915->runtime_pm);
wf->wakeref = intel_runtime_pm_get(rpm);
}

static void rpm_put(struct drm_i915_private *i915, struct intel_wakeref *wf)
static void rpm_put(struct intel_runtime_pm *rpm, struct intel_wakeref *wf)
{
intel_wakeref_t wakeref = fetch_and_zero(&wf->wakeref);

intel_runtime_pm_put(&i915->runtime_pm, wakeref);
intel_runtime_pm_put(rpm, wakeref);
GEM_BUG_ON(!wakeref);
}

int __intel_wakeref_get_first(struct drm_i915_private *i915,
int __intel_wakeref_get_first(struct intel_runtime_pm *rpm,
struct intel_wakeref *wf,
int (*fn)(struct intel_wakeref *wf))
{
Expand All @@ -34,11 +34,11 @@ int __intel_wakeref_get_first(struct drm_i915_private *i915,
if (!atomic_read(&wf->count)) {
int err;

rpm_get(i915, wf);
rpm_get(rpm, wf);

err = fn(wf);
if (unlikely(err)) {
rpm_put(i915, wf);
rpm_put(rpm, wf);
mutex_unlock(&wf->mutex);
return err;
}
Expand All @@ -51,15 +51,15 @@ int __intel_wakeref_get_first(struct drm_i915_private *i915,
return 0;
}

int __intel_wakeref_put_last(struct drm_i915_private *i915,
int __intel_wakeref_put_last(struct intel_runtime_pm *rpm,
struct intel_wakeref *wf,
int (*fn)(struct intel_wakeref *wf))
{
int err;

err = fn(wf);
if (likely(!err))
rpm_put(i915, wf);
rpm_put(rpm, wf);
else
atomic_inc(&wf->count);
mutex_unlock(&wf->mutex);
Expand All @@ -86,17 +86,17 @@ static void wakeref_auto_timeout(struct timer_list *t)
wakeref = fetch_and_zero(&wf->wakeref);
spin_unlock_irqrestore(&wf->lock, flags);

intel_runtime_pm_put(&wf->i915->runtime_pm, wakeref);
intel_runtime_pm_put(wf->rpm, wakeref);
}

void intel_wakeref_auto_init(struct intel_wakeref_auto *wf,
struct drm_i915_private *i915)
struct intel_runtime_pm *rpm)
{
spin_lock_init(&wf->lock);
timer_setup(&wf->timer, wakeref_auto_timeout, 0);
refcount_set(&wf->count, 0);
wf->wakeref = 0;
wf->i915 = i915;
wf->rpm = rpm;
}

void intel_wakeref_auto(struct intel_wakeref_auto *wf, unsigned long timeout)
Expand All @@ -110,13 +110,13 @@ void intel_wakeref_auto(struct intel_wakeref_auto *wf, unsigned long timeout)
}

/* Our mission is that we only extend an already active wakeref */
assert_rpm_wakelock_held(&wf->i915->runtime_pm);
assert_rpm_wakelock_held(wf->rpm);

if (!refcount_inc_not_zero(&wf->count)) {
spin_lock_irqsave(&wf->lock, flags);
if (!refcount_inc_not_zero(&wf->count)) {
GEM_BUG_ON(wf->wakeref);
wf->wakeref = intel_runtime_pm_get_if_in_use(&wf->i915->runtime_pm);
wf->wakeref = intel_runtime_pm_get_if_in_use(wf->rpm);
refcount_set(&wf->count, 1);
}
spin_unlock_irqrestore(&wf->lock, flags);
Expand Down
18 changes: 9 additions & 9 deletions drivers/gpu/drm/i915/intel_wakeref.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include <linux/stackdepot.h>
#include <linux/timer.h>

struct drm_i915_private;
struct intel_runtime_pm;

typedef depot_stack_handle_t intel_wakeref_t;

Expand All @@ -31,10 +31,10 @@ void __intel_wakeref_init(struct intel_wakeref *wf,
__intel_wakeref_init((wf), &__key); \
} while (0)

int __intel_wakeref_get_first(struct drm_i915_private *i915,
int __intel_wakeref_get_first(struct intel_runtime_pm *rpm,
struct intel_wakeref *wf,
int (*fn)(struct intel_wakeref *wf));
int __intel_wakeref_put_last(struct drm_i915_private *i915,
int __intel_wakeref_put_last(struct intel_runtime_pm *rpm,
struct intel_wakeref *wf,
int (*fn)(struct intel_wakeref *wf));

Expand All @@ -55,12 +55,12 @@ int __intel_wakeref_put_last(struct drm_i915_private *i915,
* code otherwise.
*/
static inline int
intel_wakeref_get(struct drm_i915_private *i915,
intel_wakeref_get(struct intel_runtime_pm *rpm,
struct intel_wakeref *wf,
int (*fn)(struct intel_wakeref *wf))
{
if (unlikely(!atomic_inc_not_zero(&wf->count)))
return __intel_wakeref_get_first(i915, wf, fn);
return __intel_wakeref_get_first(rpm, wf, fn);

return 0;
}
Expand All @@ -82,12 +82,12 @@ intel_wakeref_get(struct drm_i915_private *i915,
* code otherwise.
*/
static inline int
intel_wakeref_put(struct drm_i915_private *i915,
intel_wakeref_put(struct intel_runtime_pm *rpm,
struct intel_wakeref *wf,
int (*fn)(struct intel_wakeref *wf))
{
if (atomic_dec_and_mutex_lock(&wf->count, &wf->mutex))
return __intel_wakeref_put_last(i915, wf, fn);
return __intel_wakeref_put_last(rpm, wf, fn);

return 0;
}
Expand Down Expand Up @@ -133,7 +133,7 @@ intel_wakeref_active(struct intel_wakeref *wf)
}

struct intel_wakeref_auto {
struct drm_i915_private *i915;
struct intel_runtime_pm *rpm;
struct timer_list timer;
intel_wakeref_t wakeref;
spinlock_t lock;
Expand All @@ -158,7 +158,7 @@ struct intel_wakeref_auto {
void intel_wakeref_auto(struct intel_wakeref_auto *wf, unsigned long timeout);

void intel_wakeref_auto_init(struct intel_wakeref_auto *wf,
struct drm_i915_private *i915);
struct intel_runtime_pm *rpm);
void intel_wakeref_auto_fini(struct intel_wakeref_auto *wf);

#endif /* INTEL_WAKEREF_H */

0 comments on commit 58a111f

Please sign in to comment.