AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-21 19:19:57 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

drm/i915: Remove the GEM idle worker

Browse Source 
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
This commit is contained in:
Chris Wilson 2019-10-04 14:40:03 +01:00
parent 7e80576266
commit 33d856445b
5 changed files with 2 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 @@ void i915_gem_resume(struct drm_i915_private *i915)
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;

3
drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c
View File

@ -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)

5
drivers/gpu/drm/i915/i915_debugfs.c
View File

@ -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);

9
drivers/gpu/drm/i915/i915_drv.h
View File

@ -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 */

6
drivers/gpu/drm/i915/selftests/mock_gem_device.c
View File

@ -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);