| Message ID | 20190429080159.12356-1-chris@chris-wilson.co.uk |
|---|---|
| State | Accepted |
| Commit | 8a9b36e2588b85e954f71dc03f165091a6fe0593 |
| Headers | show |
| Series |
"Series without cover letter"
( rev:
2
1
)
in
Intel GFX |
diff --git a/drivers/gpu/drm/i915/i915_gem_pm.c b/drivers/gpu/drm/i915/i915_gem_pm.c index 3554d55dae35..3b6e8d5be8e1 100644 --- a/drivers/gpu/drm/i915/i915_gem_pm.c +++ b/drivers/gpu/drm/i915/i915_gem_pm.c @@ -47,13 +47,7 @@ static void idle_work_handler(struct work_struct *work) struct drm_i915_private *i915 = container_of(work, typeof(*i915), gem.idle_work.work); - if (!mutex_trylock(&i915->drm.struct_mutex)) { - /* Currently busy, come back later */ - mod_delayed_work(i915->wq, - &i915->gem.idle_work, - msecs_to_jiffies(50)); - return; - } + mutex_lock(&i915->drm.struct_mutex); intel_wakeref_lock(&i915->gt.wakeref); if (!intel_wakeref_active(&i915->gt.wakeref))
When the system is idling, contention for struct_mutex should be low and so we will be more efficient to wait for a contended mutex than reschedule. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> --- drivers/gpu/drm/i915/i915_gem_pm.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)