diff options
| author | Jani Nikula | 2022-08-29 14:44:38 +0300 |
|---|---|---|
| committer | Jani Nikula | 2022-08-29 15:14:59 +0300 |
| commit | 917bda9ab155032a02be1a57ebd4d949ae9e1528 (patch) | |
| tree | 7758d62783f5fb81777c37d0ad4e26eea6312c0f /drivers/gpu/drm/i915/i915_drv.h | |
| parent | 95086cb969b2cb8abe4984457f219ec70d24052e (diff) | |
| parent | 2c2d7a67defa198a8b8148dbaddc9e5554efebc8 (diff) | |
Merge drm/drm-next into drm-intel-next
Sync drm-intel-next with v6.0-rc as well as recent drm-intel-gt-next.
Since drm-next does not have commit f0c70d41e4e8 ("drm/i915/guc: remove
runtime info printing from time stamp logging") yet, only
drm-intel-gt-next, will need to do that as part of the merge here to
build.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.h')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index f12f3aa3bc13..443ed6dac92a 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -162,7 +162,7 @@ struct i915_gem_mm { * List of objects which are pending destruction. */ struct llist_head free_list; - struct delayed_work free_work; + struct work_struct free_work; /** * Count of objects pending destructions. Used to skip needlessly * waiting on an RCU barrier if no objects are waiting to be freed. @@ -1134,7 +1134,7 @@ static inline void i915_gem_drain_freed_objects(struct drm_i915_private *i915) * armed the work again. */ while (atomic_read(&i915->mm.free_count)) { - flush_delayed_work(&i915->mm.free_work); + flush_work(&i915->mm.free_work); flush_delayed_work(&i915->bdev.wq); rcu_barrier(); } |