diff options
| author | Imre Deak <[email protected]> | 2021-05-26 17:37:28 +0300 |
|---|---|---|
| committer | Imre Deak <[email protected]> | 2021-06-03 19:23:39 +0300 |
| commit | dd839aa857eb045e688c893ac588385c7fecde6a (patch) | |
| tree | 75f43ac32b142ee45d50e52c9279344f2da8cafe | |
| parent | 4a300e65b59b6625a9c258902e6e976054333642 (diff) | |
drm/i915: Fix incorrect assert about pending power domain async-put work
It's possible that an already dequeued put_async_work() will release the
reference (*) that was put asynchronously after the dequeue happened.
This leaves an async-put work pending, without any reference to release.
A subsequent async-put may trigger the
drm_WARN_ON(!queue_delayed_work(&power_domains->async_put_work));
warn due to async_put_work() still pending. To avoid the warn, cancel
the pending async_put_work() when releasing the reference at (*) above.
Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/3421
Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/2289
Signed-off-by: Imre Deak <[email protected]>
Reviewed-by: Anshuman Gupta <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_display_power.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_display_power.c b/drivers/gpu/drm/i915/display/intel_display_power.c index c8471d70cb8e..2ece50323c6d 100644 --- a/drivers/gpu/drm/i915/display/intel_display_power.c +++ b/drivers/gpu/drm/i915/display/intel_display_power.c @@ -2263,6 +2263,12 @@ intel_display_power_put_async_work(struct work_struct *work) fetch_and_zero(&power_domains->async_put_domains[1]); queue_async_put_domains_work(power_domains, fetch_and_zero(&new_work_wakeref)); + } else { + /* + * Cancel the work that got queued after this one got dequeued, + * since here we released the corresponding async-put reference. + */ + cancel_delayed_work(&power_domains->async_put_work); } out_verify: |