drm/i915: Remove the GEM idle worker

Nothing inside the idle worker now requires struct_mutex, so we can
remove the indirection of using our own worker.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191004134015.13204-9-chris@chris-wilson.co.uk

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_pm.c b/drivers/gpu/drm/i915/gem/i915_gem_pm.c
index 2ddc3aeaac9d42a72ea352c921bd31551bd95453..26f325bbfe4d216e41deb34a3f65c14edd945363 100644 (file)
--- a/drivers/gpu/drm/i915/gem/i915_gem_pm.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_pm.c
@@ -13,36 +13,13 @@
 
 static void i915_gem_park(struct drm_i915_private *i915)
 {
-       lockdep_assert_held(&i915->drm.struct_mutex);
+       cancel_delayed_work(&i915->gem.retire_work);
 
        i915_vma_parked(i915);
 
        i915_globals_park();
 }
 
-static void idle_work_handler(struct work_struct *work)
-{
-       struct drm_i915_private *i915 =
-               container_of(work, typeof(*i915), gem.idle_work);
-       bool park;
-
-       cancel_delayed_work_sync(&i915->gem.retire_work);
-       mutex_lock(&i915->drm.struct_mutex);
-
-       intel_wakeref_lock(&i915->gt.wakeref);
-       park = (!intel_wakeref_is_active(&i915->gt.wakeref) &&
-               !work_pending(work));
-       intel_wakeref_unlock(&i915->gt.wakeref);
-       if (park)
-               i915_gem_park(i915);
-       else
-               queue_delayed_work(i915->wq,
-                                  &i915->gem.retire_work,
-                                  round_jiffies_up_relative(HZ));
-
-       mutex_unlock(&i915->drm.struct_mutex);
-}
-
 static void retire_work_handler(struct work_struct *work)
 {
        struct drm_i915_private *i915 =
@@ -71,7 +48,7 @@ static int pm_notifier(struct notifier_block *nb,
                break;
 
        case INTEL_GT_PARK:
-               queue_work(i915->wq, &i915->gem.idle_work);
+               i915_gem_park(i915);
                break;
        }
 
@@ -264,7 +241,6 @@ err_wedged:
 
 void i915_gem_init__pm(struct drm_i915_private *i915)
 {
-       INIT_WORK(&i915->gem.idle_work, idle_work_handler);
        INIT_DELAYED_WORK(&i915->gem.retire_work, retire_work_handler);
 
        i915->gem.pm_notifier.notifier_call = pm_notifier;

diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c b/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c
index 856b8e467ee819de200d3f83a54b6a34d1f3f047..4ba6ed5c8313cb5455ba0acff53ca72b21bf9410 100644 (file)
--- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c
+++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c
@@ -572,11 +572,8 @@ static bool assert_mmap_offset(struct drm_i915_private *i915,
 static void disable_retire_worker(struct drm_i915_private *i915)
 {
        i915_gem_driver_unregister__shrinker(i915);
-
        intel_gt_pm_get(&i915->gt);
-
        cancel_delayed_work_sync(&i915->gem.retire_work);
-       flush_work(&i915->gem.idle_work);
 }
 
 static void restore_retire_worker(struct drm_i915_private *i915)

diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 385289895107b0a92b5d61533cb0ffb917bd6335..7c4bba21adcd635979f465fb4c9c73cc1075d1ec 100644 (file)
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -3662,11 +3662,6 @@ i915_drop_caches_set(void *data, u64 val)
                i915_gem_shrink_all(i915);
        fs_reclaim_release(GFP_KERNEL);
 
-       if (val & DROP_IDLE) {
-               flush_delayed_work(&i915->gem.retire_work);
-               flush_work(&i915->gem.idle_work);
-       }
-
        if (val & DROP_FREED)
                i915_gem_drain_freed_objects(i915);
 

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 337d8306416a5a45f7259e0a04ea05659da58865..ad31852e430923c5feabdaa3b94e1978a236aeab 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1719,15 +1719,6 @@ struct drm_i915_private {
                 * fires, go retire requests.
                 */
                struct delayed_work retire_work;
-
-               /**
-                * When we detect an idle GPU, we want to turn on
-                * powersaving features. So once we see that there
-                * are no more requests outstanding and no more
-                * arrive within a small period of time, we fire
-                * off the idle_work.
-                */
-               struct work_struct idle_work;
        } gem;
 
        /* For i945gm vblank irq vs. C3 workaround */

diff --git a/drivers/gpu/drm/i915/selftests/mock_gem_device.c b/drivers/gpu/drm/i915/selftests/mock_gem_device.c
index 622bb2127453b91d91f61a07886c936ca41f82fd..a8be5da2b3cf946564933486fe0ceaa539152415 100644 (file)
--- a/drivers/gpu/drm/i915/selftests/mock_gem_device.c
+++ b/drivers/gpu/drm/i915/selftests/mock_gem_device.c
@@ -55,7 +55,6 @@ static void mock_device_release(struct drm_device *dev)
 
        mock_device_flush(i915);
 
-       flush_work(&i915->gem.idle_work);
        i915_gem_drain_workqueue(i915);
 
        mutex_lock(&i915->drm.struct_mutex);
@@ -103,10 +102,6 @@ static void mock_retire_work_handler(struct work_struct *work)
 {
 }
 
-static void mock_idle_work_handler(struct work_struct *work)
-{
-}
-
 static int pm_domain_resume(struct device *dev)
 {
        return pm_generic_runtime_resume(dev);
@@ -187,7 +182,6 @@ struct drm_i915_private *mock_gem_device(void)
        mock_init_contexts(i915);
 
        INIT_DELAYED_WORK(&i915->gem.retire_work, mock_retire_work_handler);
-       INIT_WORK(&i915->gem.idle_work, mock_idle_work_handler);
 
        intel_timelines_init(i915);