diff options
| author | Ville Syrjälä <[email protected]> | 2019-09-10 15:13:47 +0300 |
|---|---|---|
| committer | Ville Syrjälä <[email protected]> | 2019-09-11 16:58:53 +0300 |
| commit | c26a058680dcf3140b6c4e918a16074a5e739b95 (patch) | |
| tree | b49a5f2f7e89ea6d25de97e85462f443e1b3385d | |
| parent | 43ed22753cf18c4bf60de81d567beee908e5e9f3 (diff) | |
drm/i915: Use a high priority wq for nonblocking plane updates
system_unbound_wq can't keep up sometimes and we get dropped frames.
Switch to a high priority variant.
Reported-by: Heinrich Fink <[email protected]>
Tested-by: Heinrich Fink <[email protected]>
Signed-off-by: Ville Syrjälä <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
Reviewed-by: Chris Wilson <[email protected]>
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_display.c | 6 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index 3b5275ab66cf..2668744007b3 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -14272,7 +14272,7 @@ static int intel_atomic_commit(struct drm_device *dev, if (nonblock && state->modeset) { queue_work(dev_priv->modeset_wq, &state->base.commit_work); } else if (nonblock) { - queue_work(system_unbound_wq, &state->base.commit_work); + queue_work(dev_priv->flip_wq, &state->base.commit_work); } else { if (state->modeset) flush_workqueue(dev_priv->modeset_wq); @@ -16181,6 +16181,8 @@ int intel_modeset_init(struct drm_device *dev) int ret; dev_priv->modeset_wq = alloc_ordered_workqueue("i915_modeset", 0); + dev_priv->flip_wq = alloc_workqueue("i915_flip", WQ_HIGHPRI | + WQ_UNBOUND, WQ_UNBOUND_MAX_ACTIVE); drm_mode_config_init(dev); @@ -17139,6 +17141,7 @@ void intel_modeset_driver_remove(struct drm_device *dev) { struct drm_i915_private *dev_priv = to_i915(dev); + flush_workqueue(dev_priv->flip_wq); flush_workqueue(dev_priv->modeset_wq); flush_work(&dev_priv->atomic_helper.free_work); @@ -17175,6 +17178,7 @@ void intel_modeset_driver_remove(struct drm_device *dev) intel_gmbus_teardown(dev_priv); + destroy_workqueue(dev_priv->flip_wq); destroy_workqueue(dev_priv->modeset_wq); intel_fbc_cleanup_cfb(dev_priv); diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 51d575cca2ac..2ea11123e933 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -1438,6 +1438,8 @@ struct drm_i915_private { /* ordered wq for modesets */ struct workqueue_struct *modeset_wq; + /* unbound hipri wq for page flips/plane updates */ + struct workqueue_struct *flip_wq; /* Display functions */ struct drm_i915_display_funcs display; |