drm/i915: implement internal workqueues
Subsystems (3)
v6 cover drm/i915: implement internal workqueues
This is v6 of [1], creating i915->unordered_wq also for mock devices.
BR,
Jani.
[1] https://patchwork.freedesktop.org/series/118947/
Luca Coelho (3):
drm/i915: use pointer to i915 instead of rpm in wakeref drm/i915: add a dedicated workqueue inside drm_i915_private drm/i915/selftests: add local workqueue for SW fence selftest
drivers/gpu/drm/i915/display/intel_display.c | 5 ++-- .../drm/i915/display/intel_display_driver.c | 2 +- drivers/gpu/drm/i915/display/intel_dmc.c | 2 +- drivers/gpu/drm/i915/display/intel_dp.c | 2 +- .../drm/i915/display/intel_dp_link_training.c | 3 ++- drivers/gpu/drm/i915/display/intel_drrs.c | 4 +++- drivers/gpu/drm/i915/display/intel_fbc.c | 2 +- drivers/gpu/drm/i915/display/intel_fbdev.c | 3 ++- drivers/gpu/drm/i915/display/intel_hdcp.c | 23 +++++++++++-------- drivers/gpu/drm/i915/display/intel_hotplug.c | 18 ++++++++++----- drivers/gpu/drm/i915/display/intel_opregion.c | 3 ++- drivers/gpu/drm/i915/display/intel_pps.c | 4 +++- drivers/gpu/drm/i915/display/intel_psr.c | 8 ++++--- drivers/gpu/drm/i915/gt/intel_engine_pm.c | 4 +--- .../drm/i915/gt/intel_execlists_submission.c | 5 ++-- .../gpu/drm/i915/gt/intel_gt_buffer_pool.c | 10 ++++---- drivers/gpu/drm/i915/gt/intel_gt_irq.c | 2 +- drivers/gpu/drm/i915/gt/intel_gt_pm.c | 2 +- drivers/gpu/drm/i915/gt/intel_gt_requests.c | 10 ++++---- drivers/gpu/drm/i915/gt/intel_reset.c | 2 +- drivers/gpu/drm/i915/gt/intel_rps.c | 20 ++++++++-------- drivers/gpu/drm/i915/gt/selftest_engine_cs.c | 2 +- drivers/gpu/drm/i915/i915_driver.c | 13 +++++++++++ drivers/gpu/drm/i915/i915_drv.h | 10 ++++++++ drivers/gpu/drm/i915/i915_request.c | 2 +- drivers/gpu/drm/i915/intel_runtime_pm.c | 2 +- drivers/gpu/drm/i915/intel_wakeref.c | 22 ++++++++++-------- drivers/gpu/drm/i915/intel_wakeref.h | 12 +++++----- .../gpu/drm/i915/selftests/i915_sw_fence.c | 16 ++++++++++--- .../gpu/drm/i915/selftests/mock_gem_device.c | 7 ++++++ 30 files changed, 143 insertions(+), 77 deletions(-)
Signature · 1 line
2.39.2
PATCH v6 1/3 drm/i915: use pointer to i915 instead of rpm in wakeref
From: Luca Coelho <[email protected]>
Currently a pointer to an intel_runtime_pm structure is stored in the wake reference structures so the runtime data can be accessed. We can save the entire device information (drm_i915_private) instead, since we'll need to reference the new workqueue we'll add in subsequent patches.
--- drivers/gpu/drm/i915/gt/intel_engine_pm.c | 4 +--- drivers/gpu/drm/i915/gt/intel_gt_pm.c | 2 +- drivers/gpu/drm/i915/intel_runtime_pm.c | 2 +- drivers/gpu/drm/i915/intel_wakeref.c | 20 +++++++++++--------- drivers/gpu/drm/i915/intel_wakeref.h | 12 ++++++------ 5 files changed, 20 insertions(+), 20 deletions(-)
drivers/gpu/drm/i915/gt/intel_engine_pm.c +1 -3
@@ -296,9 +296,7 @@ static const struct intel_wakeref_ops wf_ops = {void intel_engine_init__pm (struct intel_engine_cs *engine) { -struct intel_runtime_pm *rpm = engine->uncore->rpm; - -intel_wakeref_init (&engine->wakeref, rpm, &wf_ops); +intel_wakeref_init (&engine->wakeref, engine->i915, &wf_ops);intel_engine_init_heartbeat (engine);intel_gsc_idle_msg_enable (engine);
drivers/gpu/drm/i915/gt/intel_gt_pm.c +1 -1
@@ -137,7 +137,7 @@ void intel_gt_pm_init_early(struct intel_gt *gt)* runtime_pm is per-device rather than per-tile, so this is still the * correct structure. */ -intel_wakeref_init (>->wakeref, >->i915->runtime_pm, &wf_ops); +intel_wakeref_init (>->wakeref, gt->i915, &wf_ops);seqcount_mutex_init (>->stats.lock, >->wakeref.mutex); }
drivers/gpu/drm/i915/intel_runtime_pm.c +1 -1
@@ -658,5 +658,5 @@ void intel_runtime_pm_init_early(struct intel_runtime_pm *rpm)init_intel_runtime_pm_wakeref (rpm);INIT_LIST_HEAD (&rpm->lmem_userfault_list);spin_lock_init (&rpm->lmem_userfault_lock); -intel_wakeref_auto_init (&rpm->userfault_wakeref, rpm); +intel_wakeref_auto_init (&rpm->userfault_wakeref, i915); }
drivers/gpu/drm/i915/intel_wakeref.c +11 -9
@@ -8,17 +8,18 @@#include "intel_runtime_pm.h" #include "intel_wakeref.h" +#include "i915_drv.h" static void rpm_get (struct intel_wakeref *wf) { - wf->wakeref =intel_runtime_pm_get (wf->rpm); + wf->wakeref =intel_runtime_pm_get (&wf->i915->runtime_pm); }static void rpm_put (struct intel_wakeref *wf) {intel_wakeref_t wakeref =fetch_and_zero (&wf->wakeref); -intel_runtime_pm_put (wf->rpm, wakeref); +intel_runtime_pm_put (&wf->i915->runtime_pm, wakeref);INTEL_WAKEREF_BUG_ON (!wakeref); }
@@ -94,11 +95,11 @@ static void __intel_wakeref_put_work(struct work_struct *wrk) }void __intel_wakeref_init (struct intel_wakeref *wf, -struct intel_runtime_pm *rpm, +struct drm_i915_private *i915,const struct intel_wakeref_ops *ops,struct intel_wakeref_lockclass *key) { - wf->rpm = rpm; + wf->i915 = i915; wf->ops = ops;__mutex_init (&wf->mutex,"wakeref.mutex" , &key->mutex);
@@ -137,17 +138,17 @@ static void wakeref_auto_timeout(struct timer_list *t) wakeref =fetch_and_zero (&wf->wakeref);spin_unlock_irqrestore (&wf->lock, flags); -intel_runtime_pm_put (wf->rpm, wakeref); +intel_runtime_pm_put (&wf->i915->runtime_pm, wakeref); }void intel_wakeref_auto_init (struct intel_wakeref_auto *wf, -struct intel_runtime_pm *rpm) +struct drm_i915_private *i915) {spin_lock_init (&wf->lock);timer_setup (&wf->timer, wakeref_auto_timeout,0 );refcount_set (&wf->count,0 ); wf->wakeref =0 ; - wf->rpm = rpm; + wf->i915 = i915; }void intel_wakeref_auto (struct intel_wakeref_auto *wf,unsigned long timeout)
@@ -161,13 +162,14 @@ void intel_wakeref_auto(struct intel_wakeref_auto *wf, unsigned long timeout) }/* Our mission is that we only extend an already active wakeref */ -assert_rpm_wakelock_held (wf->rpm); +assert_rpm_wakelock_held (&wf->i915->runtime_pm);if (!refcount_inc_not_zero (&wf->count)) {spin_lock_irqsave (&wf->lock, flags);if (!refcount_inc_not_zero (&wf->count)) {INTEL_WAKEREF_BUG_ON (wf->wakeref); - wf->wakeref =intel_runtime_pm_get_if_in_use (wf->rpm); + wf->wakeref = +intel_runtime_pm_get_if_in_use (&wf->i915->runtime_pm);refcount_set (&wf->count,1 ); }spin_unlock_irqrestore (&wf->lock, flags);
drivers/gpu/drm/i915/intel_wakeref.h +6 -6
@@ -39,7 +39,7 @@ struct intel_wakeref {intel_wakeref_t wakeref; -struct intel_runtime_pm *rpm; +struct drm_i915_private *i915;const struct intel_wakeref_ops *ops;struct delayed_work work;
@@ -51,13 +51,13 @@ struct intel_wakeref_lockclass { };void __intel_wakeref_init (struct intel_wakeref *wf, -struct intel_runtime_pm *rpm, +struct drm_i915_private *i915,const struct intel_wakeref_ops *ops,struct intel_wakeref_lockclass *key); -#define intel_wakeref_init (wf, rpm, ops) do { \ +#define intel_wakeref_init (wf, i915, ops) do { \ static struct intel_wakeref_lockclass __key; \ \ - __intel_wakeref_init((wf), (rpm), (ops), &__key); \ + __intel_wakeref_init((wf), (i915), (ops), &__key); \ } while (0)int __intel_wakeref_get_first (struct intel_wakeref *wf);
@@ -262,7 +262,7 @@ __intel_wakeref_defer_park(struct intel_wakeref *wf)int intel_wakeref_wait_for_idle (struct intel_wakeref *wf);struct intel_wakeref_auto { -struct intel_runtime_pm *rpm; +struct drm_i915_private *i915;struct timer_list timer;intel_wakeref_t wakeref;spinlock_t lock;
@@ -287,7 +287,7 @@ struct intel_wakeref_auto {void intel_wakeref_auto (struct intel_wakeref_auto *wf,unsigned long timeout);void intel_wakeref_auto_init (struct intel_wakeref_auto *wf, -struct intel_runtime_pm *rpm); +struct drm_i915_private *i915);void intel_wakeref_auto_fini (struct intel_wakeref_auto *wf);#endif /* INTEL_WAKEREF_H */
Signature · 1 line
2.39.2
PATCH v6 2/3 drm/i915: add a dedicated workqueue inside drm_i915_private
In reply to Jani NikulaFrom: Luca Coelho <[email protected]>
In order to avoid flush_scheduled_work() usage, add a dedicated workqueue in the drm_i915_private structure. In this way, we don't need to use the system queue anymore.
This change is mostly mechanical and based on Tetsuo's original patch[1].
v6 by Jani:
- Also create unordered_wq for mock device
--- drivers/gpu/drm/i915/display/intel_display.c | 5 ++-- .../drm/i915/display/intel_display_driver.c | 2 +- drivers/gpu/drm/i915/display/intel_dmc.c | 2 +- drivers/gpu/drm/i915/display/intel_dp.c | 2 +- .../drm/i915/display/intel_dp_link_training.c | 3 ++- drivers/gpu/drm/i915/display/intel_drrs.c | 4 +++- drivers/gpu/drm/i915/display/intel_fbc.c | 2 +- drivers/gpu/drm/i915/display/intel_fbdev.c | 3 ++- drivers/gpu/drm/i915/display/intel_hdcp.c | 23 +++++++++++-------- drivers/gpu/drm/i915/display/intel_hotplug.c | 18 ++++++++++----- drivers/gpu/drm/i915/display/intel_opregion.c | 3 ++- drivers/gpu/drm/i915/display/intel_pps.c | 4 +++- drivers/gpu/drm/i915/display/intel_psr.c | 8 ++++--- .../drm/i915/gt/intel_execlists_submission.c | 5 ++-- .../gpu/drm/i915/gt/intel_gt_buffer_pool.c | 10 ++++---- drivers/gpu/drm/i915/gt/intel_gt_irq.c | 2 +- drivers/gpu/drm/i915/gt/intel_gt_requests.c | 10 ++++---- drivers/gpu/drm/i915/gt/intel_reset.c | 2 +- drivers/gpu/drm/i915/gt/intel_rps.c | 20 ++++++++-------- drivers/gpu/drm/i915/gt/selftest_engine_cs.c | 2 +- drivers/gpu/drm/i915/i915_driver.c | 13 +++++++++++ drivers/gpu/drm/i915/i915_drv.h | 10 ++++++++ drivers/gpu/drm/i915/i915_request.c | 2 +- drivers/gpu/drm/i915/intel_wakeref.c | 2 +- .../gpu/drm/i915/selftests/mock_gem_device.c | 7 ++++++ 25 files changed, 110 insertions(+), 54 deletions(-)
drivers/gpu/drm/i915/display/intel_display.c +3 -2
@@ -7180,11 +7180,12 @@ intel_atomic_commit_ready(struct i915_sw_fence *fence,break ;case FENCE_FREE : { +struct drm_i915_private *i915 =to_i915 (state->base.dev);struct intel_atomic_helper *helper = - &to_i915 (state->base.dev)->display.atomic_helper; + &i915->display.atomic_helper;if (llist_add (&state->freed, &helper->free_list)) -schedule_work (&helper->free_work); +queue_work (i915->unordered_wq, &helper->free_work);break ; } }
drivers/gpu/drm/i915/display/intel_display_driver.c +1 -1
@@ -442,7 +442,7 @@ void intel_display_driver_remove_noirq(struct drm_i915_private *i915)intel_unregister_dsm_handler ();/* flush any delayed tasks or pending work */ -flush_scheduled_work (); +flush_workqueue (i915->unordered_wq);intel_hdcp_component_fini (i915);
drivers/gpu/drm/i915/display/intel_dmc.c +1 -1
@@ -1057,7 +1057,7 @@ void intel_dmc_init(struct drm_i915_private *i915) i915->display.dmc.dmc = dmc;drm_dbg_kms (&i915->drm,"Loading %s\n" , dmc->fw_path); -schedule_work (&dmc->work); +queue_work (i915->unordered_wq, &dmc->work);return ;
drivers/gpu/drm/i915/display/intel_dp.c +1 -1
@@ -5251,7 +5251,7 @@ static void intel_dp_oob_hotplug_event(struct drm_connector *connector)spin_lock_irq (&i915->irq_lock); i915->display.hotplug.event_bits |=BIT (encoder->hpd_pin);spin_unlock_irq (&i915->irq_lock); -queue_delayed_work (system_wq, &i915->display.hotplug.hotplug_work,0 ); +queue_delayed_work (i915->unordered_wq, &i915->display.hotplug.hotplug_work,0 ); }static const struct drm_connector_funcs intel_dp_connector_funcs = {
drivers/gpu/drm/i915/display/intel_dp_link_training.c +2 -1
@@ -1064,6 +1064,7 @@ static void intel_dp_schedule_fallback_link_training(struct intel_dp *intel_dp, const struct intel_crtc_state *crtc_state) {struct intel_connector *intel_connector = intel_dp->attached_connector; +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);if (!intel_digital_port_connected (&dp_to_dig_port (intel_dp)->base)) {lt_dbg (intel_dp,DP_PHY_DPRX ,"Link Training failed on disconnected sink.\n" );
@@ -1081,7 +1082,7 @@ static void intel_dp_schedule_fallback_link_training(struct intel_dp *intel_dp, }/* Schedule a Hotplug Uevent to userspace to start modeset */ -schedule_work (&intel_connector->modeset_retry_work); +queue_work (i915->unordered_wq, &intel_connector->modeset_retry_work); }/* Perform the link training on all LTTPRs and the DPRX on a link. */
drivers/gpu/drm/i915/display/intel_drrs.c +3 -1
@@ -111,7 +111,9 @@ static void intel_drrs_set_state(struct intel_crtc *crtc,static void intel_drrs_schedule_work (struct intel_crtc *crtc) { -mod_delayed_work (system_wq, &crtc->drrs.work,msecs_to_jiffies (1000 )); +struct drm_i915_private *i915 =to_i915 (crtc->base.dev); + +mod_delayed_work (i915->unordered_wq, &crtc->drrs.work,msecs_to_jiffies (1000 )); }static unsigned int intel_drrs_frontbuffer_bits (const struct intel_crtc_state *crtc_state)
drivers/gpu/drm/i915/display/intel_fbc.c +1 -1
@@ -1600,7 +1600,7 @@ static void __intel_fbc_handle_fifo_underrun_irq(struct intel_fbc *fbc)if (READ_ONCE (fbc->underrun_detected))return ; -schedule_work (&fbc->underrun_work); +queue_work (fbc->i915->unordered_wq, &fbc->underrun_work); }/**
drivers/gpu/drm/i915/display/intel_fbdev.c +2 -1
@@ -696,7 +696,8 @@ void intel_fbdev_set_suspend(struct drm_device *dev, int state, bool synchronous/* Don't block our own workqueue as this can * be run in parallel with other i915.ko tasks. */ -schedule_work (&dev_priv->display.fbdev.suspend_work); +queue_work (dev_priv->unordered_wq, + &dev_priv->display.fbdev.suspend_work);return ; } }
drivers/gpu/drm/i915/display/intel_hdcp.c +14 -9
@@ -983,6 +983,7 @@ static void intel_hdcp_update_value(struct intel_connector *connector,struct drm_device *dev = connector->base.dev;struct intel_digital_port *dig_port =intel_attached_dig_port (connector);struct intel_hdcp *hdcp = &connector->hdcp; +struct drm_i915_private *i915 =to_i915 (connector->base.dev);drm_WARN_ON (connector->base.dev, !mutex_is_locked (&hdcp->mutex));
@@ -1001,7 +1002,7 @@ static void intel_hdcp_update_value(struct intel_connector *connector, hdcp->value = value;if (update_property) {drm_connector_get (&connector->base); -schedule_work (&hdcp->prop_work); +queue_work (i915->unordered_wq, &hdcp->prop_work); } }
@@ -2090,16 +2091,17 @@ static void intel_hdcp_check_work(struct work_struct *work) struct intel_hdcp, check_work);struct intel_connector *connector =intel_hdcp_to_connector (hdcp); +struct drm_i915_private *i915 =to_i915 (connector->base.dev);if (drm_connector_is_unregistered (&connector->base))return ;if (!intel_hdcp2_check_link (connector)) -schedule_delayed_work (&hdcp->check_work, -DRM_HDCP2_CHECK_PERIOD_MS ); +queue_delayed_work (i915->unordered_wq, &hdcp->check_work, +DRM_HDCP2_CHECK_PERIOD_MS );else if (!intel_hdcp_check_link (connector)) -schedule_delayed_work (&hdcp->check_work, -DRM_HDCP_CHECK_PERIOD_MS ); +queue_delayed_work (i915->unordered_wq, &hdcp->check_work, +DRM_HDCP_CHECK_PERIOD_MS ); } static int i915_hdcp_component_bind(struct device *i915_kdev,
@@ -2398,7 +2400,8 @@ int intel_hdcp_enable(struct intel_atomic_state *state, }if (!ret) { -schedule_delayed_work (&hdcp->check_work, check_link_interval); +queue_delayed_work (i915->unordered_wq, &hdcp->check_work, + check_link_interval);intel_hdcp_update_value (connector,DRM_MODE_CONTENT_PROTECTION_ENABLED , true);
@@ -2447,6 +2450,7 @@ void intel_hdcp_update_pipe(struct intel_atomic_state *state,to_intel_connector (conn_state->connector);struct intel_hdcp *hdcp = &connector->hdcp;bool content_protection_type_changed, desired_and_not_enabled = false; +struct drm_i915_private *i915 =to_i915 (connector->base.dev);if (!connector->hdcp.shim)return ;
@@ -2473,7 +2477,7 @@ void intel_hdcp_update_pipe(struct intel_atomic_state *state,mutex_lock (&hdcp->mutex); hdcp->value =DRM_MODE_CONTENT_PROTECTION_DESIRED ;drm_connector_get (&connector->base); -schedule_work (&hdcp->prop_work); +queue_work (i915->unordered_wq, &hdcp->prop_work);mutex_unlock (&hdcp->mutex); }
@@ -2490,7 +2494,7 @@ void intel_hdcp_update_pipe(struct intel_atomic_state *state,*/ if (!desired_and_not_enabled && !content_protection_type_changed) {drm_connector_get (&connector->base); -schedule_work (&hdcp->prop_work); +queue_work (i915->unordered_wq, &hdcp->prop_work); } }
@@ -2602,6 +2606,7 @@ void intel_hdcp_atomic_check(struct drm_connector *connector,void intel_hdcp_handle_cp_irq (struct intel_connector *connector) {struct intel_hdcp *hdcp = &connector->hdcp; +struct drm_i915_private *i915 =to_i915 (connector->base.dev);if (!hdcp->shim)return ;
@@ -2609,5 +2614,5 @@ void intel_hdcp_handle_cp_irq(struct intel_connector *connector)atomic_inc (&connector->hdcp.cp_irq_count);wake_up_all (&connector->hdcp.cp_irq_queue); -schedule_delayed_work (&hdcp->check_work,0 ); +queue_delayed_work (i915->unordered_wq, &hdcp->check_work,0 ); }
drivers/gpu/drm/i915/display/intel_hotplug.c +12 -6
@@ -212,7 +212,8 @@ intel_hpd_irq_storm_switch_to_polling(struct drm_i915_private *dev_priv)/* Enable polling and queue hotplug re-enabling. */ if (hpd_disabled) {drm_kms_helper_poll_enable (&dev_priv->drm); -mod_delayed_work (system_wq, &dev_priv->display.hotplug.reenable_work, +mod_delayed_work (dev_priv->unordered_wq, + &dev_priv->display.hotplug.reenable_work,msecs_to_jiffies (HPD_STORM_REENABLE_DELAY )); } }
@@ -339,7 +340,8 @@ static void i915_digport_work_func(struct work_struct *work)spin_lock_irq (&dev_priv->irq_lock); dev_priv->display.hotplug.event_bits |= old_bits;spin_unlock_irq (&dev_priv->irq_lock); -queue_delayed_work (system_wq, &dev_priv->display.hotplug.hotplug_work,0 ); +queue_delayed_work (dev_priv->unordered_wq, + &dev_priv->display.hotplug.hotplug_work,0 ); } }
@@ -446,7 +448,8 @@ static void i915_hotplug_work_func(struct work_struct *work) dev_priv->display.hotplug.retry_bits |= retry;spin_unlock_irq (&dev_priv->irq_lock); -mod_delayed_work (system_wq, &dev_priv->display.hotplug.hotplug_work, +mod_delayed_work (dev_priv->unordered_wq, + &dev_priv->display.hotplug.hotplug_work,msecs_to_jiffies (HPD_RETRY_DELAY )); } }
@@ -577,7 +580,8 @@ void intel_hpd_irq_handler(struct drm_i915_private *dev_priv,if (queue_dig)queue_work (dev_priv->display.hotplug.dp_wq, &dev_priv->display.hotplug.dig_port_work);if (queue_hp) -queue_delayed_work (system_wq, &dev_priv->display.hotplug.hotplug_work,0 ); +queue_delayed_work (dev_priv->unordered_wq, + &dev_priv->display.hotplug.hotplug_work,0 ); }/**
@@ -687,7 +691,8 @@ void intel_hpd_poll_enable(struct drm_i915_private *dev_priv)* As well, there's no issue if we race here since we always reschedule * this worker anyway */ -schedule_work (&dev_priv->display.hotplug.poll_init_work); +queue_work (dev_priv->unordered_wq, + &dev_priv->display.hotplug.poll_init_work); }/**
@@ -715,7 +720,8 @@ void intel_hpd_poll_disable(struct drm_i915_private *dev_priv)return ;WRITE_ONCE (dev_priv->display.hotplug.poll_enabled, false); -schedule_work (&dev_priv->display.hotplug.poll_init_work); +queue_work (dev_priv->unordered_wq, + &dev_priv->display.hotplug.poll_init_work); }void intel_hpd_init_early (struct drm_i915_private *i915)
drivers/gpu/drm/i915/display/intel_opregion.c +2 -1
@@ -635,7 +635,8 @@ static void asle_work(struct work_struct *work)void intel_opregion_asle_intr (struct drm_i915_private *dev_priv) {if (dev_priv->display.opregion.asle) -schedule_work (&dev_priv->display.opregion.asle_work); +queue_work (dev_priv->unordered_wq, + &dev_priv->display.opregion.asle_work); }#define ACPI_EV_DISPLAY_SWITCH (1<<0)
drivers/gpu/drm/i915/display/intel_pps.c +3 -1
@@ -867,6 +867,7 @@ static void edp_panel_vdd_work(struct work_struct *__work)static void edp_panel_vdd_schedule_off (struct intel_dp *intel_dp) { +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);unsigned long delay;/*
@@ -882,7 +883,8 @@ static void edp_panel_vdd_schedule_off(struct intel_dp *intel_dp)* operations. */ delay =msecs_to_jiffies (intel_dp->pps.panel_power_cycle_delay *5 ); -schedule_delayed_work (&intel_dp->pps.panel_vdd_work, delay); +queue_delayed_work (i915->unordered_wq, + &intel_dp->pps.panel_vdd_work, delay); }/*
drivers/gpu/drm/i915/display/intel_psr.c +5 -3
@@ -341,7 +341,7 @@ void intel_psr_irq_handler(struct intel_dp *intel_dp, u32 psr_iir)*/ intel_de_rmw (dev_priv, imr_reg,0 ,psr_irq_psr_error_bit_get (intel_dp)); -schedule_work (&intel_dp->psr.work); +queue_work (dev_priv->unordered_wq, &intel_dp->psr.work); } }
@@ -2440,6 +2440,8 @@ static void tgl_dc3co_flush_locked(struct intel_dp *intel_dp, unsigned int frontbuffer_bits, enum fb_op_origin origin) { + struct drm_i915_private *i915 = dp_to_i915(intel_dp); +if (!intel_dp->psr.dc3co_exitline || !intel_dp->psr.psr2_enabled || !intel_dp->psr.active)return ;
@@ -2453,7 +2455,7 @@ tgl_dc3co_flush_locked(struct intel_dp *intel_dp, unsigned int frontbuffer_bits,return ;tgl_psr2_enable_dc3co (intel_dp); -mod_delayed_work (system_wq, &intel_dp->psr.dc3co_work, +mod_delayed_work (i915->unordered_wq, &intel_dp->psr.dc3co_work, intel_dp->psr.dc3co_exit_delay); }
@@ -2493,7 +2495,7 @@ static void _psr_flush_handle(struct intel_dp *intel_dp)psr_force_hw_tracking_exit (intel_dp);if (!intel_dp->psr.active && !intel_dp->psr.busy_frontbuffer_bits) -schedule_work (&intel_dp->psr.work); +queue_work (dev_priv->unordered_wq, &intel_dp->psr.work); } }
drivers/gpu/drm/i915/gt/intel_execlists_submission.c +3 -2
@@ -2327,6 +2327,7 @@ static u32 active_ccid(struct intel_engine_cs *engine)static void execlists_capture (struct intel_engine_cs *engine) { +struct drm_i915_private *i915 = engine->i915;struct execlists_capture *cap;if (!IS_ENABLED (CONFIG_DRM_I915_CAPTURE_ERROR ))
@@ -2375,7 +2376,7 @@ static void execlists_capture(struct intel_engine_cs *engine) goto err_rq;INIT_WORK (&cap->work, execlists_capture_work); -schedule_work (&cap->work); +queue_work (i915->unordered_wq, &cap->work);return ; err_rq:
@@ -3680,7 +3681,7 @@ static void virtual_context_destroy(struct kref *kref)* lock, we can delegate the free of the engine to an RCU worker. */ INIT_RCU_WORK (&ve->rcu, rcu_virtual_context_destroy); -queue_rcu_work (system_wq, &ve->rcu); +queue_rcu_work (ve->context.engine->i915->unordered_wq, &ve->rcu); }static void virtual_engine_initial_hint (struct virtual_engine *ve)
drivers/gpu/drm/i915/gt/intel_gt_buffer_pool.c +6 -4
@@ -88,10 +88,11 @@ static void pool_free_work(struct work_struct *wrk) {struct intel_gt_buffer_pool *pool =container_of (wrk,typeof (*pool), work.work); + struct intel_gt *gt = container_of(pool, struct intel_gt, buffer_pool);if (pool_free_older_than (pool,HZ )) -schedule_delayed_work (&pool->work, -round_jiffies_up_relative (HZ )); +queue_delayed_work (gt->i915->unordered_wq, &pool->work, +round_jiffies_up_relative (HZ )); }static void pool_retire (struct i915_active *ref)
@@ -99,6 +100,7 @@ static void pool_retire(struct i915_active *ref)struct intel_gt_buffer_pool_node *node =container_of (ref,typeof (*node), active);struct intel_gt_buffer_pool *pool = node->pool; + struct intel_gt *gt = container_of(pool, struct intel_gt, buffer_pool);struct list_head *list =bucket_for_size (pool, node->obj->base.size);unsigned long flags;
@@ -116,8 +118,8 @@ static void pool_retire(struct i915_active *ref)WRITE_ONCE (node->age, jiffies ?:1 );/* 0 reserved for active nodes */ spin_unlock_irqrestore (&pool->lock, flags); -schedule_delayed_work (&pool->work, -round_jiffies_up_relative (HZ )); +queue_delayed_work (gt->i915->unordered_wq, &pool->work, +round_jiffies_up_relative (HZ )); }void intel_gt_buffer_pool_mark_used (struct intel_gt_buffer_pool_node *node)
drivers/gpu/drm/i915/gt/intel_gt_irq.c +1 -1
@@ -376,7 +376,7 @@ static void gen7_parity_error_irq_handler(struct intel_gt *gt, u32 iir)if (iir >_RENDER_L3_PARITY_ERROR_INTERRUPT ) gt->i915->l3_parity.which_slice |=1 <<0 ; -schedule_work (>->i915->l3_parity.error_work); +queue_work (gt->i915->unordered_wq, >->i915->l3_parity.error_work); }void gen6_gt_irq_handler (struct intel_gt *gt,u32 gt_iir)
drivers/gpu/drm/i915/gt/intel_gt_requests.c +5 -5
@@ -116,7 +116,7 @@ void intel_engine_add_retire(struct intel_engine_cs *engine,GEM_BUG_ON (intel_engine_is_virtual (engine));if (add_retire (engine, tl)) -schedule_work (&engine->retire_work); +queue_work (engine->i915->unordered_wq, &engine->retire_work); }void intel_engine_init_retire (struct intel_engine_cs *engine)
@@ -207,8 +207,8 @@ static void retire_work_handler(struct work_struct *work)struct intel_gt *gt =container_of (work,typeof (*gt), requests.retire_work.work); -schedule_delayed_work (>->requests.retire_work, -round_jiffies_up_relative (HZ )); +queue_delayed_work (gt->i915->unordered_wq, >->requests.retire_work, +round_jiffies_up_relative (HZ ));intel_gt_retire_requests (gt); }
@@ -224,8 +224,8 @@ void intel_gt_park_requests(struct intel_gt *gt)void intel_gt_unpark_requests (struct intel_gt *gt) { -schedule_delayed_work (>->requests.retire_work, -round_jiffies_up_relative (HZ )); +queue_delayed_work (gt->i915->unordered_wq, >->requests.retire_work, +round_jiffies_up_relative (HZ )); }void intel_gt_fini_requests (struct intel_gt *gt)
drivers/gpu/drm/i915/gt/intel_reset.c +1 -1
@@ -1625,7 +1625,7 @@ void __intel_init_wedge(struct intel_wedge_me *w, w->name = name;INIT_DELAYED_WORK_ONSTACK (&w->work, intel_wedge_me); -schedule_delayed_work (&w->work, timeout); +queue_delayed_work (gt->i915->unordered_wq, &w->work, timeout); }void __intel_fini_wedge (struct intel_wedge_me *w)
drivers/gpu/drm/i915/gt/intel_rps.c +11 -9
@@ -73,13 +73,14 @@ static void set(struct intel_uncore *uncore, i915_reg_t reg, u32 val)static void rps_timer (struct timer_list *t) {struct intel_rps *rps =from_timer (rps, t, timer); +struct intel_gt *gt =rps_to_gt (rps);struct intel_engine_cs *engine;ktime_t dt, last, timestamp;enum intel_engine_id id;s64 max_busy[3 ] = {}; timestamp =0 ; -for_each_engine (engine,rps_to_gt (rps), id) { +for_each_engine (engine, gt, id) {s64 busy;int i;
@@ -123,7 +124,7 @@ static void rps_timer(struct timer_list *t) busy +=div_u64 (max_busy[i],1 << i); } - GT_TRACE(rps_to_gt(rps), + GT_TRACE(gt, "busy:%lld [%d%%], max:[%lld, %lld, %lld], interval:%d\n", busy, (int)div64_u64(100 * busy, dt), max_busy[0], max_busy[1], max_busy[2],
@@ -133,12 +134,12 @@ static void rps_timer(struct timer_list *t) rps->cur_freq < rps->max_freq_softlimit) { rps->pm_iir |=GEN6_PM_RP_UP_THRESHOLD ; rps->pm_interval =1 ; -schedule_work (&rps->work); +queue_work (gt->i915->unordered_wq, &rps->work); } else if (100 * busy < rps->power.down_threshold * dt && rps->cur_freq > rps->min_freq_softlimit) { rps->pm_iir |=GEN6_PM_RP_DOWN_THRESHOLD ; rps->pm_interval =1 ; -schedule_work (&rps->work); +queue_work (gt->i915->unordered_wq, &rps->work); } else { rps->last_adj =0 ; }
@@ -973,7 +974,7 @@ static int rps_set_boost_freq(struct intel_rps *rps, u32 val) }mutex_unlock (&rps->lock);if (boost) -schedule_work (&rps->work); +queue_work (rps_to_gt (rps)->i915->unordered_wq, &rps->work);return 0 ; }
@@ -1025,7 +1026,8 @@ void intel_rps_boost(struct i915_request *rq)if (!atomic_fetch_inc (&slpc->num_waiters)) {GT_TRACE (rps_to_gt (rps),"boost fence:%llx:%llx\n" , rq->fence.context, rq->fence.seqno); -schedule_work (&slpc->boost_work); +queue_work (rps_to_gt (rps)->i915->unordered_wq, + &slpc->boost_work); }return ;
@@ -1041,7 +1043,7 @@ void intel_rps_boost(struct i915_request *rq) rq->fence.context, rq->fence.seqno);if (READ_ONCE (rps->cur_freq) < rps->boost_freq) -schedule_work (&rps->work); +queue_work (rps_to_gt (rps)->i915->unordered_wq, &rps->work);WRITE_ONCE (rps->boosts, rps->boosts +1 );/* debug only */ }
@@ -1900,7 +1902,7 @@ void gen11_rps_irq_handler(struct intel_rps *rps, u32 pm_iir)gen6_gt_pm_mask_irq (gt, events); rps->pm_iir |= events; -schedule_work (&rps->work); +queue_work (gt->i915->unordered_wq, &rps->work); }void gen6_rps_irq_handler (struct intel_rps *rps,u32 pm_iir)
@@ -1917,7 +1919,7 @@ void gen6_rps_irq_handler(struct intel_rps *rps, u32 pm_iir)gen6_gt_pm_mask_irq (gt, events); rps->pm_iir |= events; -schedule_work (&rps->work); +queue_work (gt->i915->unordered_wq, &rps->work);spin_unlock (gt->irq_lock); }
drivers/gpu/drm/i915/gt/selftest_engine_cs.c +1 -1
@@ -27,7 +27,7 @@ static void perf_begin(struct intel_gt *gt)/* Boost gpufreq to max [waitboost] and keep it fixed */ atomic_inc (>->rps.num_waiters); -schedule_work (>->rps.work); +queue_work (gt->i915->unordered_wq, >->rps.work);flush_work (>->rps.work); }
drivers/gpu/drm/i915/i915_driver.c +13 -0
@@ -132,8 +132,20 @@ static int i915_workqueues_init(struct drm_i915_private *dev_priv)if (dev_priv->display.hotplug.dp_wq ==NULL ) goto out_free_wq; +/* +* The unordered i915 workqueue should be used for all work +* scheduling that do not require running in order, which used +* to be scheduled on the system_wq before moving to a driver +* instance due deprecation of flush_scheduled_work(). +*/ + dev_priv->unordered_wq =alloc_workqueue ("i915-unordered" ,0 ,0 ); +if (dev_priv->unordered_wq ==NULL ) + goto out_free_dp_wq; +return 0 ; +out_free_dp_wq: +destroy_workqueue (dev_priv->display.hotplug.dp_wq); out_free_wq:destroy_workqueue (dev_priv->wq); out_err:
@@ -144,6 +156,7 @@ static int i915_workqueues_init(struct drm_i915_private *dev_priv)static void i915_workqueues_cleanup (struct drm_i915_private *dev_priv) { +destroy_workqueue (dev_priv->unordered_wq);destroy_workqueue (dev_priv->display.hotplug.dp_wq);destroy_workqueue (dev_priv->wq); }
drivers/gpu/drm/i915/i915_drv.h +10 -0
@@ -260,6 +260,16 @@ struct drm_i915_private {*/ struct workqueue_struct *wq; +/** +* unordered_wq - internal workqueue for unordered work +* +* This workqueue should be used for all unordered work +* scheduling within i915, which used to be scheduled on the +* system_wq before moving to a driver instance due +* deprecation of flush_scheduled_work(). +*/ +struct workqueue_struct *unordered_wq; +/* pm private clock gating functions */ const struct drm_i915_clock_gating_funcs *clock_gating_funcs;
drivers/gpu/drm/i915/i915_request.c +1 -1
@@ -290,7 +290,7 @@ static enum hrtimer_restart __rq_watchdog_expired(struct hrtimer *hrtimer)if (!i915_request_completed (rq)) {if (llist_add (&rq->watchdog.link, >->watchdog.list)) -schedule_work (>->watchdog.work); +queue_work (gt->i915->unordered_wq, >->watchdog.work); }else {i915_request_put (rq); }
drivers/gpu/drm/i915/intel_wakeref.c +1 -1
@@ -75,7 +75,7 @@ void __intel_wakeref_put_last(struct intel_wakeref *wf, unsigned long flags)/* Assume we are not in process context and so cannot sleep. */ if (flags &INTEL_WAKEREF_PUT_ASYNC || !mutex_trylock (&wf->mutex)) { -mod_delayed_work (system_wq, &wf->work, +mod_delayed_work (wf->i915->unordered_wq, &wf->work,FIELD_GET (INTEL_WAKEREF_PUT_DELAY , flags));return ; }
drivers/gpu/drm/i915/selftests/mock_gem_device.c +7 -0
@@ -69,6 +69,7 @@ static void mock_device_release(struct drm_device *dev)i915_gem_drain_workqueue (i915);mock_fini_ggtt (to_gt (i915)->ggtt); +destroy_workqueue (i915->unordered_wq);destroy_workqueue (i915->wq);intel_region_ttm_device_fini (i915);
@@ -208,6 +209,10 @@ struct drm_i915_private *mock_gem_device(void)if (!i915->wq) goto err_drv; + i915->unordered_wq =alloc_workqueue ("mock-unordered" ,0 ,0 ); +if (!i915->unordered_wq) + goto err_wq; +mock_init_contexts (i915);/* allocate the ggtt */
@@ -239,6 +244,8 @@ struct drm_i915_private *mock_gem_device(void) err_context:intel_gt_driver_remove (to_gt (i915)); err_unlock: +destroy_workqueue (i915->unordered_wq); +err_wq:destroy_workqueue (i915->wq); err_drv:intel_region_ttm_device_fini (i915);
Signature · 1 line
2.39.2
Re: [Intel-gfx] [PATCH v6 2/3] drm/i915: add a dedicated workqueue inside drm_i915_private
Quoted 11 lines · Jani Nikula
From: Luca Coelho <[email protected]>
In order to avoid
flush_scheduled_work()usage, add a dedicated workqueue in thedrm_i915_privatestructure. In this way, we don't need to use the system queue anymore.This change is mostly mechanical and based on Tetsuo's original patch[1].
v6 by Jani:
- Also createunordered_wqfor mock device
For the gt/ and mock parts:
Regards,
Tvrtko
Quoted 735 lines
Cc Tetsuo Handa <[email protected]>Cc Tvrtko Ursulin <[email protected]>Cc Jani Nikula <[email protected]>Cc Ville Syrjälä <[email protected]>Reviewed-by Jani Nikula <[email protected]>Signed-off-by Luca Coelho <[email protected]>Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/display/intel_display.c | 5 ++-- .../drm/i915/display/intel_display_driver.c | 2 +- drivers/gpu/drm/i915/display/intel_dmc.c | 2 +- drivers/gpu/drm/i915/display/intel_dp.c | 2 +- .../drm/i915/display/intel_dp_link_training.c | 3 ++- drivers/gpu/drm/i915/display/intel_drrs.c | 4 +++- drivers/gpu/drm/i915/display/intel_fbc.c | 2 +- drivers/gpu/drm/i915/display/intel_fbdev.c | 3 ++- drivers/gpu/drm/i915/display/intel_hdcp.c | 23 +++++++++++-------- drivers/gpu/drm/i915/display/intel_hotplug.c | 18 ++++++++++----- drivers/gpu/drm/i915/display/intel_opregion.c | 3 ++- drivers/gpu/drm/i915/display/intel_pps.c | 4 +++- drivers/gpu/drm/i915/display/intel_psr.c | 8 ++++--- .../drm/i915/gt/intel_execlists_submission.c | 5 ++-- .../gpu/drm/i915/gt/intel_gt_buffer_pool.c | 10 ++++---- drivers/gpu/drm/i915/gt/intel_gt_irq.c | 2 +- drivers/gpu/drm/i915/gt/intel_gt_requests.c | 10 ++++---- drivers/gpu/drm/i915/gt/intel_reset.c | 2 +- drivers/gpu/drm/i915/gt/intel_rps.c | 20 ++++++++-------- drivers/gpu/drm/i915/gt/selftest_engine_cs.c | 2 +- drivers/gpu/drm/i915/i915_driver.c | 13 +++++++++++ drivers/gpu/drm/i915/i915_drv.h | 10 ++++++++ drivers/gpu/drm/i915/i915_request.c | 2 +- drivers/gpu/drm/i915/intel_wakeref.c | 2 +- .../gpu/drm/i915/selftests/mock_gem_device.c | 7 ++++++ 25 files changed, 110 insertions(+), 54 deletions(-)drivers/gpu/drm/i915/display/intel_display.c +3
-2@@ -7180,11 +7180,12 @@ intel_atomic_commit_ready(struct i915_sw_fence *fence,break ;case FENCE_FREE : { +struct drm_i915_private *i915 =to_i915 (state->base.dev);struct intel_atomic_helper *helper = - &to_i915 (state->base.dev)->display.atomic_helper; + &i915->display.atomic_helper;if (llist_add (&state->freed, &helper->free_list)) -schedule_work (&helper->free_work); +queue_work (i915->unordered_wq, &helper->free_work);break ; } }drivers/gpu/drm/i915/display/intel_display_driver.c +1
-1@@ -442,7 +442,7 @@ void intel_display_driver_remove_noirq(struct drm_i915_private *i915)intel_unregister_dsm_handler ();/* flush any delayed tasks or pending work */ -flush_scheduled_work (); +flush_workqueue (i915->unordered_wq);intel_hdcp_component_fini (i915);drivers/gpu/drm/i915/display/intel_dmc.c +1
-1@@ -1057,7 +1057,7 @@ void intel_dmc_init(struct drm_i915_private *i915) i915->display.dmc.dmc = dmc;drm_dbg_kms (&i915->drm,"Loading %s\n" , dmc->fw_path); -schedule_work (&dmc->work); +queue_work (i915->unordered_wq, &dmc->work);return ;drivers/gpu/drm/i915/display/intel_dp.c +1
-1@@ -5251,7 +5251,7 @@ static void intel_dp_oob_hotplug_event(struct drm_connector *connector)spin_lock_irq (&i915->irq_lock); i915->display.hotplug.event_bits |=BIT (encoder->hpd_pin);spin_unlock_irq (&i915->irq_lock); -queue_delayed_work (system_wq, &i915->display.hotplug.hotplug_work,0 ); +queue_delayed_work (i915->unordered_wq, &i915->display.hotplug.hotplug_work,0 ); }static const struct drm_connector_funcs intel_dp_connector_funcs = {drivers/gpu/drm/i915/display/intel_dp_link_training.c +2
-1@@ -1064,6 +1064,7 @@ static void intel_dp_schedule_fallback_link_training(struct intel_dp *intel_dp, const struct intel_crtc_state *crtc_state) {struct intel_connector *intel_connector = intel_dp->attached_connector; +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);if (!intel_digital_port_connected (&dp_to_dig_port (intel_dp)->base)) {lt_dbg (intel_dp,DP_PHY_DPRX ,"Link Training failed on disconnected sink.\n" );@@ -1081,7 +1082,7 @@ static void intel_dp_schedule_fallback_link_training(struct intel_dp *intel_dp, }/* Schedule a Hotplug Uevent to userspace to start modeset */ -schedule_work (&intel_connector->modeset_retry_work); +queue_work (i915->unordered_wq, &intel_connector->modeset_retry_work); }/* Perform the link training on all LTTPRs and the DPRX on a link. */ drivers/gpu/drm/i915/display/intel_drrs.c +3
-1@@ -111,7 +111,9 @@ static void intel_drrs_set_state(struct intel_crtc *crtc,static void intel_drrs_schedule_work (struct intel_crtc *crtc) { -mod_delayed_work (system_wq, &crtc->drrs.work,msecs_to_jiffies (1000 )); +struct drm_i915_private *i915 =to_i915 (crtc->base.dev); + +mod_delayed_work (i915->unordered_wq, &crtc->drrs.work,msecs_to_jiffies (1000 )); }static unsigned int intel_drrs_frontbuffer_bits (const struct intel_crtc_state *crtc_state)drivers/gpu/drm/i915/display/intel_fbc.c +1
-1@@ -1600,7 +1600,7 @@ static void __intel_fbc_handle_fifo_underrun_irq(struct intel_fbc *fbc)if (READ_ONCE (fbc->underrun_detected))return ; -schedule_work (&fbc->underrun_work); +queue_work (fbc->i915->unordered_wq, &fbc->underrun_work); }/** drivers/gpu/drm/i915/display/intel_fbdev.c +2
-1@@ -696,7 +696,8 @@ void intel_fbdev_set_suspend(struct drm_device *dev, int state, bool synchronous/* Don't block our own workqueue as this can * be run in parallel with other i915.ko tasks. */ -schedule_work (&dev_priv->display.fbdev.suspend_work); +queue_work (dev_priv->unordered_wq, + &dev_priv->display.fbdev.suspend_work);return ; } }drivers/gpu/drm/i915/display/intel_hdcp.c +14
-9@@ -983,6 +983,7 @@ static void intel_hdcp_update_value(struct intel_connector *connector,struct drm_device *dev = connector->base.dev;struct intel_digital_port *dig_port =intel_attached_dig_port (connector);struct intel_hdcp *hdcp = &connector->hdcp; +struct drm_i915_private *i915 =to_i915 (connector->base.dev);drm_WARN_ON (connector->base.dev, !mutex_is_locked (&hdcp->mutex));@@ -1001,7 +1002,7 @@ static void intel_hdcp_update_value(struct intel_connector *connector, hdcp->value = value;if (update_property) {drm_connector_get (&connector->base); -schedule_work (&hdcp->prop_work); +queue_work (i915->unordered_wq, &hdcp->prop_work); } }@@ -2090,16 +2091,17 @@ static void intel_hdcp_check_work(struct work_struct *work) struct intel_hdcp, check_work);struct intel_connector *connector =intel_hdcp_to_connector (hdcp); +struct drm_i915_private *i915 =to_i915 (connector->base.dev);if (drm_connector_is_unregistered (&connector->base))return ;if (!intel_hdcp2_check_link (connector)) -schedule_delayed_work (&hdcp->check_work, -DRM_HDCP2_CHECK_PERIOD_MS ); +queue_delayed_work (i915->unordered_wq, &hdcp->check_work, +DRM_HDCP2_CHECK_PERIOD_MS );else if (!intel_hdcp_check_link (connector)) -schedule_delayed_work (&hdcp->check_work, -DRM_HDCP_CHECK_PERIOD_MS ); +queue_delayed_work (i915->unordered_wq, &hdcp->check_work, +DRM_HDCP_CHECK_PERIOD_MS ); } static int i915_hdcp_component_bind(struct device *i915_kdev,@@ -2398,7 +2400,8 @@ int intel_hdcp_enable(struct intel_atomic_state *state, }if (!ret) { -schedule_delayed_work (&hdcp->check_work, check_link_interval); +queue_delayed_work (i915->unordered_wq, &hdcp->check_work, + check_link_interval);intel_hdcp_update_value (connector,DRM_MODE_CONTENT_PROTECTION_ENABLED , true);@@ -2447,6 +2450,7 @@ void intel_hdcp_update_pipe(struct intel_atomic_state *state,to_intel_connector (conn_state->connector);struct intel_hdcp *hdcp = &connector->hdcp;bool content_protection_type_changed, desired_and_not_enabled = false; +struct drm_i915_private *i915 =to_i915 (connector->base.dev);if (!connector->hdcp.shim)return ;@@ -2473,7 +2477,7 @@ void intel_hdcp_update_pipe(struct intel_atomic_state *state,mutex_lock (&hdcp->mutex); hdcp->value =DRM_MODE_CONTENT_PROTECTION_DESIRED ;drm_connector_get (&connector->base); -schedule_work (&hdcp->prop_work); +queue_work (i915->unordered_wq, &hdcp->prop_work);mutex_unlock (&hdcp->mutex); }@@ -2490,7 +2494,7 @@ void intel_hdcp_update_pipe(struct intel_atomic_state *state,*/ if (!desired_and_not_enabled && !content_protection_type_changed) {drm_connector_get (&connector->base); -schedule_work (&hdcp->prop_work); +queue_work (i915->unordered_wq, &hdcp->prop_work); } }@@ -2602,6 +2606,7 @@ void intel_hdcp_atomic_check(struct drm_connector *connector,void intel_hdcp_handle_cp_irq (struct intel_connector *connector) {struct intel_hdcp *hdcp = &connector->hdcp; +struct drm_i915_private *i915 =to_i915 (connector->base.dev);if (!hdcp->shim)return ;@@ -2609,5 +2614,5 @@ void intel_hdcp_handle_cp_irq(struct intel_connector *connector)atomic_inc (&connector->hdcp.cp_irq_count);wake_up_all (&connector->hdcp.cp_irq_queue); -schedule_delayed_work (&hdcp->check_work,0 ); +queue_delayed_work (i915->unordered_wq, &hdcp->check_work,0 ); }drivers/gpu/drm/i915/display/intel_hotplug.c +12
-6@@ -212,7 +212,8 @@ intel_hpd_irq_storm_switch_to_polling(struct drm_i915_private *dev_priv)/* Enable polling and queue hotplug re-enabling. */ if (hpd_disabled) {drm_kms_helper_poll_enable (&dev_priv->drm); -mod_delayed_work (system_wq, &dev_priv->display.hotplug.reenable_work, +mod_delayed_work (dev_priv->unordered_wq, + &dev_priv->display.hotplug.reenable_work,msecs_to_jiffies (HPD_STORM_REENABLE_DELAY )); } }@@ -339,7 +340,8 @@ static void i915_digport_work_func(struct work_struct *work)spin_lock_irq (&dev_priv->irq_lock); dev_priv->display.hotplug.event_bits |= old_bits;spin_unlock_irq (&dev_priv->irq_lock); -queue_delayed_work (system_wq, &dev_priv->display.hotplug.hotplug_work,0 ); +queue_delayed_work (dev_priv->unordered_wq, + &dev_priv->display.hotplug.hotplug_work,0 ); } }@@ -446,7 +448,8 @@ static void i915_hotplug_work_func(struct work_struct *work) dev_priv->display.hotplug.retry_bits |= retry;spin_unlock_irq (&dev_priv->irq_lock); -mod_delayed_work (system_wq, &dev_priv->display.hotplug.hotplug_work, +mod_delayed_work (dev_priv->unordered_wq, + &dev_priv->display.hotplug.hotplug_work,msecs_to_jiffies (HPD_RETRY_DELAY )); } }@@ -577,7 +580,8 @@ void intel_hpd_irq_handler(struct drm_i915_private *dev_priv,if (queue_dig)queue_work (dev_priv->display.hotplug.dp_wq, &dev_priv->display.hotplug.dig_port_work);if (queue_hp) -queue_delayed_work (system_wq, &dev_priv->display.hotplug.hotplug_work,0 ); +queue_delayed_work (dev_priv->unordered_wq, + &dev_priv->display.hotplug.hotplug_work,0 ); }/** @@ -687,7 +691,8 @@ void intel_hpd_poll_enable(struct drm_i915_private *dev_priv)* As well, there's no issue if we race here since we always reschedule * this worker anyway */ -schedule_work (&dev_priv->display.hotplug.poll_init_work); +queue_work (dev_priv->unordered_wq, + &dev_priv->display.hotplug.poll_init_work); }/** @@ -715,7 +720,8 @@ void intel_hpd_poll_disable(struct drm_i915_private *dev_priv)return ;WRITE_ONCE (dev_priv->display.hotplug.poll_enabled, false); -schedule_work (&dev_priv->display.hotplug.poll_init_work); +queue_work (dev_priv->unordered_wq, + &dev_priv->display.hotplug.poll_init_work); }void intel_hpd_init_early (struct drm_i915_private *i915)drivers/gpu/drm/i915/display/intel_opregion.c +2
-1@@ -635,7 +635,8 @@ static void asle_work(struct work_struct *work)void intel_opregion_asle_intr (struct drm_i915_private *dev_priv) {if (dev_priv->display.opregion.asle) -schedule_work (&dev_priv->display.opregion.asle_work); +queue_work (dev_priv->unordered_wq, + &dev_priv->display.opregion.asle_work); }#define ACPI_EV_DISPLAY_SWITCH (1<<0)drivers/gpu/drm/i915/display/intel_pps.c +3
-1@@ -867,6 +867,7 @@ static void edp_panel_vdd_work(struct work_struct *__work)static void edp_panel_vdd_schedule_off (struct intel_dp *intel_dp) { +struct drm_i915_private *i915 =dp_to_i915 (intel_dp);unsigned long delay;/* @@ -882,7 +883,8 @@ static void edp_panel_vdd_schedule_off(struct intel_dp *intel_dp)* operations. */ delay =msecs_to_jiffies (intel_dp->pps.panel_power_cycle_delay *5 ); -schedule_delayed_work (&intel_dp->pps.panel_vdd_work, delay); +queue_delayed_work (i915->unordered_wq, + &intel_dp->pps.panel_vdd_work, delay); }/* drivers/gpu/drm/i915/display/intel_psr.c +5
-3@@ -341,7 +341,7 @@ void intel_psr_irq_handler(struct intel_dp *intel_dp, u32 psr_iir)*/ intel_de_rmw (dev_priv, imr_reg,0 ,psr_irq_psr_error_bit_get (intel_dp)); -schedule_work (&intel_dp->psr.work); +queue_work (dev_priv->unordered_wq, &intel_dp->psr.work); } }@@ -2440,6 +2440,8 @@ static void tgl_dc3co_flush_locked(struct intel_dp *intel_dp, unsigned int frontbuffer_bits, enum fb_op_origin origin) { + struct drm_i915_private *i915 = dp_to_i915(intel_dp); +if (!intel_dp->psr.dc3co_exitline || !intel_dp->psr.psr2_enabled || !intel_dp->psr.active)return ;@@ -2453,7 +2455,7 @@ tgl_dc3co_flush_locked(struct intel_dp *intel_dp, unsigned int frontbuffer_bits,return ;tgl_psr2_enable_dc3co (intel_dp); -mod_delayed_work (system_wq, &intel_dp->psr.dc3co_work, +mod_delayed_work (i915->unordered_wq, &intel_dp->psr.dc3co_work, intel_dp->psr.dc3co_exit_delay); }@@ -2493,7 +2495,7 @@ static void _psr_flush_handle(struct intel_dp *intel_dp)psr_force_hw_tracking_exit (intel_dp);if (!intel_dp->psr.active && !intel_dp->psr.busy_frontbuffer_bits) -schedule_work (&intel_dp->psr.work); +queue_work (dev_priv->unordered_wq, &intel_dp->psr.work); } }drivers/gpu/drm/i915/gt/intel_execlists_submission.c +3
-2@@ -2327,6 +2327,7 @@ static u32 active_ccid(struct intel_engine_cs *engine)static void execlists_capture (struct intel_engine_cs *engine) { +struct drm_i915_private *i915 = engine->i915;struct execlists_capture *cap;if (!IS_ENABLED (CONFIG_DRM_I915_CAPTURE_ERROR ))@@ -2375,7 +2376,7 @@ static void execlists_capture(struct intel_engine_cs *engine) goto err_rq;INIT_WORK (&cap->work, execlists_capture_work); -schedule_work (&cap->work); +queue_work (i915->unordered_wq, &cap->work);return ; err_rq:@@ -3680,7 +3681,7 @@ static void virtual_context_destroy(struct kref *kref)* lock, we can delegate the free of the engine to an RCU worker. */ INIT_RCU_WORK (&ve->rcu, rcu_virtual_context_destroy); -queue_rcu_work (system_wq, &ve->rcu); +queue_rcu_work (ve->context.engine->i915->unordered_wq, &ve->rcu); }static void virtual_engine_initial_hint (struct virtual_engine *ve)drivers/gpu/drm/i915/gt/intel_gt_buffer_pool.c +6
-4@@ -88,10 +88,11 @@ static void pool_free_work(struct work_struct *wrk) {struct intel_gt_buffer_pool *pool =container_of (wrk,typeof (*pool), work.work); + struct intel_gt *gt = container_of(pool, struct intel_gt, buffer_pool);if (pool_free_older_than (pool,HZ )) -schedule_delayed_work (&pool->work, -round_jiffies_up_relative (HZ )); +queue_delayed_work (gt->i915->unordered_wq, &pool->work, +round_jiffies_up_relative (HZ )); }static void pool_retire (struct i915_active *ref)@@ -99,6 +100,7 @@ static void pool_retire(struct i915_active *ref)struct intel_gt_buffer_pool_node *node =container_of (ref,typeof (*node), active);struct intel_gt_buffer_pool *pool = node->pool; + struct intel_gt *gt = container_of(pool, struct intel_gt, buffer_pool);struct list_head *list =bucket_for_size (pool, node->obj->base.size);unsigned long flags;@@ -116,8 +118,8 @@ static void pool_retire(struct i915_active *ref)WRITE_ONCE (node->age, jiffies ?:1 );/* 0 reserved for active nodes */ spin_unlock_irqrestore (&pool->lock, flags); -schedule_delayed_work (&pool->work, -round_jiffies_up_relative (HZ )); +queue_delayed_work (gt->i915->unordered_wq, &pool->work, +round_jiffies_up_relative (HZ )); }void intel_gt_buffer_pool_mark_used (struct intel_gt_buffer_pool_node *node)drivers/gpu/drm/i915/gt/intel_gt_irq.c +1
-1@@ -376,7 +376,7 @@ static void gen7_parity_error_irq_handler(struct intel_gt *gt, u32 iir)if (iir >_RENDER_L3_PARITY_ERROR_INTERRUPT ) gt->i915->l3_parity.which_slice |=1 <<0 ; -schedule_work (>->i915->l3_parity.error_work); +queue_work (gt->i915->unordered_wq, >->i915->l3_parity.error_work); }void gen6_gt_irq_handler (struct intel_gt *gt,u32 gt_iir)drivers/gpu/drm/i915/gt/intel_gt_requests.c +5
-5@@ -116,7 +116,7 @@ void intel_engine_add_retire(struct intel_engine_cs *engine,GEM_BUG_ON (intel_engine_is_virtual (engine));if (add_retire (engine, tl)) -schedule_work (&engine->retire_work); +queue_work (engine->i915->unordered_wq, &engine->retire_work); }void intel_engine_init_retire (struct intel_engine_cs *engine)@@ -207,8 +207,8 @@ static void retire_work_handler(struct work_struct *work)struct intel_gt *gt =container_of (work,typeof (*gt), requests.retire_work.work); -schedule_delayed_work (>->requests.retire_work, -round_jiffies_up_relative (HZ )); +queue_delayed_work (gt->i915->unordered_wq, >->requests.retire_work, +round_jiffies_up_relative (HZ ));intel_gt_retire_requests (gt); }@@ -224,8 +224,8 @@ void intel_gt_park_requests(struct intel_gt *gt)void intel_gt_unpark_requests (struct intel_gt *gt) { -schedule_delayed_work (>->requests.retire_work, -round_jiffies_up_relative (HZ )); +queue_delayed_work (gt->i915->unordered_wq, >->requests.retire_work, +round_jiffies_up_relative (HZ )); }void intel_gt_fini_requests (struct intel_gt *gt)drivers/gpu/drm/i915/gt/intel_reset.c +1
-1@@ -1625,7 +1625,7 @@ void __intel_init_wedge(struct intel_wedge_me *w, w->name = name;INIT_DELAYED_WORK_ONSTACK (&w->work, intel_wedge_me); -schedule_delayed_work (&w->work, timeout); +queue_delayed_work (gt->i915->unordered_wq, &w->work, timeout); }void __intel_fini_wedge (struct intel_wedge_me *w)drivers/gpu/drm/i915/gt/intel_rps.c +11
-9@@ -73,13 +73,14 @@ static void set(struct intel_uncore *uncore, i915_reg_t reg, u32 val)static void rps_timer (struct timer_list *t) {struct intel_rps *rps =from_timer (rps, t, timer); +struct intel_gt *gt =rps_to_gt (rps);struct intel_engine_cs *engine;ktime_t dt, last, timestamp;enum intel_engine_id id;s64 max_busy[3 ] = {}; timestamp =0 ; -for_each_engine (engine,rps_to_gt (rps), id) { +for_each_engine (engine, gt, id) {s64 busy;int i;@@ -123,7 +124,7 @@ static void rps_timer(struct timer_list *t) busy +=div_u64 (max_busy[i],1 << i); } - GT_TRACE(rps_to_gt(rps), + GT_TRACE(gt, "busy:%lld [%d%%], max:[%lld, %lld, %lld], interval:%d\n", busy, (int)div64_u64(100 * busy, dt), max_busy[0], max_busy[1], max_busy[2],@@ -133,12 +134,12 @@ static void rps_timer(struct timer_list *t) rps->cur_freq < rps->max_freq_softlimit) { rps->pm_iir |=GEN6_PM_RP_UP_THRESHOLD ; rps->pm_interval =1 ; -schedule_work (&rps->work); +queue_work (gt->i915->unordered_wq, &rps->work); } else if (100 * busy < rps->power.down_threshold * dt && rps->cur_freq > rps->min_freq_softlimit) { rps->pm_iir |=GEN6_PM_RP_DOWN_THRESHOLD ; rps->pm_interval =1 ; -schedule_work (&rps->work); +queue_work (gt->i915->unordered_wq, &rps->work); } else { rps->last_adj =0 ; }@@ -973,7 +974,7 @@ static int rps_set_boost_freq(struct intel_rps *rps, u32 val) }mutex_unlock (&rps->lock);if (boost) -schedule_work (&rps->work); +queue_work (rps_to_gt (rps)->i915->unordered_wq, &rps->work);return 0 ; }@@ -1025,7 +1026,8 @@ void intel_rps_boost(struct i915_request *rq)if (!atomic_fetch_inc (&slpc->num_waiters)) {GT_TRACE (rps_to_gt (rps),"boost fence:%llx:%llx\n" , rq->fence.context, rq->fence.seqno); -schedule_work (&slpc->boost_work); +queue_work (rps_to_gt (rps)->i915->unordered_wq, + &slpc->boost_work); }return ;@@ -1041,7 +1043,7 @@ void intel_rps_boost(struct i915_request *rq) rq->fence.context, rq->fence.seqno);if (READ_ONCE (rps->cur_freq) < rps->boost_freq) -schedule_work (&rps->work); +queue_work (rps_to_gt (rps)->i915->unordered_wq, &rps->work);WRITE_ONCE (rps->boosts, rps->boosts +1 );/* debug only */ }@@ -1900,7 +1902,7 @@ void gen11_rps_irq_handler(struct intel_rps *rps, u32 pm_iir)gen6_gt_pm_mask_irq (gt, events); rps->pm_iir |= events; -schedule_work (&rps->work); +queue_work (gt->i915->unordered_wq, &rps->work); }void gen6_rps_irq_handler (struct intel_rps *rps,u32 pm_iir)@@ -1917,7 +1919,7 @@ void gen6_rps_irq_handler(struct intel_rps *rps, u32 pm_iir)gen6_gt_pm_mask_irq (gt, events); rps->pm_iir |= events; -schedule_work (&rps->work); +queue_work (gt->i915->unordered_wq, &rps->work);spin_unlock (gt->irq_lock); }drivers/gpu/drm/i915/gt/selftest_engine_cs.c +1
-1@@ -27,7 +27,7 @@ static void perf_begin(struct intel_gt *gt)/* Boost gpufreq to max [waitboost] and keep it fixed */ atomic_inc (>->rps.num_waiters); -schedule_work (>->rps.work); +queue_work (gt->i915->unordered_wq, >->rps.work);flush_work (>->rps.work); }drivers/gpu/drm/i915/i915_driver.c +13
-0@@ -132,8 +132,20 @@ static int i915_workqueues_init(struct drm_i915_private *dev_priv)if (dev_priv->display.hotplug.dp_wq ==NULL ) goto out_free_wq; +/* +* The unordered i915 workqueue should be used for all work +* scheduling that do not require running in order, which used +* to be scheduled on the system_wq before moving to a driver +* instance due deprecation of flush_scheduled_work(). +*/ + dev_priv->unordered_wq =alloc_workqueue ("i915-unordered" ,0 ,0 ); +if (dev_priv->unordered_wq ==NULL ) + goto out_free_dp_wq; +return 0 ; +out_free_dp_wq: +destroy_workqueue (dev_priv->display.hotplug.dp_wq); out_free_wq:destroy_workqueue (dev_priv->wq); out_err:@@ -144,6 +156,7 @@ static int i915_workqueues_init(struct drm_i915_private *dev_priv)static void i915_workqueues_cleanup (struct drm_i915_private *dev_priv) { +destroy_workqueue (dev_priv->unordered_wq);destroy_workqueue (dev_priv->display.hotplug.dp_wq);destroy_workqueue (dev_priv->wq); }drivers/gpu/drm/i915/i915_drv.h +10
-0@@ -260,6 +260,16 @@ struct drm_i915_private {*/ struct workqueue_struct *wq; +/** +* unordered_wq - internal workqueue for unordered work +* +* This workqueue should be used for all unordered work +* scheduling within i915, which used to be scheduled on the +* system_wq before moving to a driver instance due +* deprecation of flush_scheduled_work(). +*/ +struct workqueue_struct *unordered_wq; +/* pm private clock gating functions */ const struct drm_i915_clock_gating_funcs *clock_gating_funcs;drivers/gpu/drm/i915/i915_request.c +1
-1@@ -290,7 +290,7 @@ static enum hrtimer_restart __rq_watchdog_expired(struct hrtimer *hrtimer)if (!i915_request_completed (rq)) {if (llist_add (&rq->watchdog.link, >->watchdog.list)) -schedule_work (>->watchdog.work); +queue_work (gt->i915->unordered_wq, >->watchdog.work); }else {i915_request_put (rq); }drivers/gpu/drm/i915/intel_wakeref.c +1
-1@@ -75,7 +75,7 @@ void __intel_wakeref_put_last(struct intel_wakeref *wf, unsigned long flags)/* Assume we are not in process context and so cannot sleep. */ if (flags &INTEL_WAKEREF_PUT_ASYNC || !mutex_trylock (&wf->mutex)) { -mod_delayed_work (system_wq, &wf->work, +mod_delayed_work (wf->i915->unordered_wq, &wf->work,FIELD_GET (INTEL_WAKEREF_PUT_DELAY , flags));return ; }drivers/gpu/drm/i915/selftests/mock_gem_device.c +7
-0@@ -69,6 +69,7 @@ static void mock_device_release(struct drm_device *dev)i915_gem_drain_workqueue (i915);mock_fini_ggtt (to_gt (i915)->ggtt); +destroy_workqueue (i915->unordered_wq);destroy_workqueue (i915->wq);intel_region_ttm_device_fini (i915);@@ -208,6 +209,10 @@ struct drm_i915_private *mock_gem_device(void)if (!i915->wq) goto err_drv; + i915->unordered_wq =alloc_workqueue ("mock-unordered" ,0 ,0 ); +if (!i915->unordered_wq) + goto err_wq; +mock_init_contexts (i915);/* allocate the ggtt */ @@ -239,6 +244,8 @@ struct drm_i915_private *mock_gem_device(void) err_context:intel_gt_driver_remove (to_gt (i915)); err_unlock: +destroy_workqueue (i915->unordered_wq); +err_wq:destroy_workqueue (i915->wq); err_drv:intel_region_ttm_device_fini (i915);
Re: [Intel-gfx] [PATCH v6 2/3] drm/i915: add a dedicated workqueue inside drm_i915_private
In reply to Jani NikulaQuoted 12 lines · Jani Nikula
From: Luca Coelho <[email protected]>
In order to avoid
flush_scheduled_work()usage, add a dedicated workqueue in thedrm_i915_privatestructure. In this way, we don't need to use the system queue anymore.This change is mostly mechanical and based on Tetsuo's original patch[1].
v6 by Jani:
- Also createunordered_wqfor mock device
Quoted 8 lines
Cc Tetsuo Handa <[email protected]>Cc Tvrtko Ursulin <[email protected]>Cc Jani Nikula <[email protected]>Cc Ville Syrjälä <[email protected]>Reviewed-by Jani Nikula <[email protected]>Signed-off-by Luca Coelho <[email protected]>Signed-off-by Jani Nikula <[email protected]>
Ah, I responded to [PATCH v6 3/3] before finding [PATCH v6 2/3] . OK, you managed to sort out which work items need to be handled by per device workqueue. Then, my patch will no longer be needed.
Quoted 12 lines
drivers/gpu/drm/i915/display/intel_display_driver.c +1
-1@@ -442,7 +442,7 @@ void intel_display_driver_remove_noirq(struct drm_i915_private *i915)intel_unregister_dsm_handler ();/* flush any delayed tasks or pending work */ -flush_scheduled_work (); +flush_workqueue (i915->unordered_wq);intel_hdcp_component_fini (i915);
PATCH v6 3/3 drm/i915/selftests: add local workqueue for SW fence selftest
In reply to Jani NikulaFrom: Luca Coelho <[email protected]>
Instead of using a global workqueue for the SW fence selftest, allocate a separate one temporarily only while running the test.
--- drivers/gpu/drm/i915/selftests/i915_sw_fence.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/selftests/i915_sw_fence.c +13 -3
@@ -523,12 +523,19 @@ static void task_ipc(struct work_struct *work)static int test_ipc (void *arg) {struct task_ipc ipc; +struct workqueue_struct *wq;int ret =0 ; + wq =alloc_workqueue ("i1915-selftest" ,0 ,0 ); +if (wq ==NULL ) +return -ENOMEM ; +/* Test use of i915_sw_fence as an interprocess signaling mechanism */ ipc.in =alloc_fence (); -if (!ipc.in) -return -ENOMEM ; +if (!ipc.in) { + ret = -ENOMEM ; + goto err_work; + } ipc.out =alloc_fence ();if (!ipc.out) { ret = -ENOMEM ;
@@ -540,7 +547,7 @@ static int test_ipc(void *arg) ipc.value =0 ;INIT_WORK_ONSTACK (&ipc.work, task_ipc); -schedule_work (&ipc.work); +queue_work (wq, &ipc.work);wait_for_completion (&ipc.started);
@@ -563,6 +570,9 @@ static int test_ipc(void *arg)free_fence (ipc.out); err_in:free_fence (ipc.in); +err_work: +destroy_workqueue (wq); +return ret; }
Signature · 1 line
2.39.2
Re: [Intel-gfx] [PATCH v6 3/3] drm/i915/selftests: add local workqueue for SW fence selftest
Quoted 11 lines · Jani Nikula
From: Luca Coelho <[email protected]>
Instead of using a global workqueue for the SW fence selftest, allocate a separate one temporarily only while running the test.
Cc Tetsuo Handa <[email protected]>Cc Jani Nikula <[email protected]>Cc Ville Syrjälä <[email protected]>Reviewed-by Tvrtko Ursulin <[email protected]>Signed-off-by Luca Coelho <[email protected]>Signed-off-by Jani Nikula <[email protected]>
This patch will conflict with
https://patchwork.freedesktop.org/patch/538384/?series=114608&rev=6 .
What should we do?
Quoted 9 lines
drivers/gpu/drm/i915/selftests/i915_sw_fence.c +1
-1@@ -540,7 +547,7 @@ static int test_ipc(void *arg) ipc.value =0 ;INIT_WORK_ONSTACK (&ipc.work, task_ipc); -schedule_work (&ipc.work); +queue_work (wq, &ipc.work);wait_for_completion (&ipc.started);
Patchwork
CI[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915: implement internal workqueues (rev4)
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/i915: implement internal workqueues (rev4)
URL : https://patchwork.freedesktop.org/series/118947/
State : warning
== Summary ==
Error: dim checkpatch failed4fef60b7a41e drm/i915: use pointer to i915 instead of rpm in wakeref a5ce4ea23a6e drm/i915: add a dedicated workqueue inside drm_i915_private
-:630: CHECK:COMPARISON_TO_NULL: Comparison to NULL could be written "!dev_priv->unordered_wq" #630: FILE: drivers/gpu/drm/i915/i915_driver.c:142:
+ if (dev_priv->unordered_wq == NULL)
total: 0 errors, 0 warnings, 1 checks, 539 lines checked 2a9d144bf0cf drm/i915/selftests: add local workqueue for SW fence selftest -:31: CHECK:COMPARISON_TO_NULL: Comparison to NULL could be written "!wq" #31: FILE: drivers/gpu/drm/i915/selftests/i915_sw_fence.c:530:
+ if (wq == NULL)
total: 0 errors, 0 warnings, 1 checks, 38 lines checked
Patchwork
CI[Intel-gfx] ✗ Fi.CI.SPARSE: warning for drm/i915: implement internal workqueues (rev4)
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/i915: implement internal workqueues (rev4)
URL : https://patchwork.freedesktop.org/series/118947/
State : warning
== Summary ==
Error: dim sparse failed
Sparse version: v0.6.2
Fast mode used, each commit won't be checked separately.
Patchwork
CI[Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915: implement internal workqueues (rev4)
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/i915: implement internal workqueues (rev4)
URL : https://patchwork.freedesktop.org/series/118947/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_13252 -> Patchwork_118947v4
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118947v4/index.html
Participating hosts (35 -> 35)
------------------------------
No changes in participating hosts
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_118947v4:
### IGT changes ###
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses. They do not affect the overall result.
* {igt@kms_pipe_crc_basic@compare-crc-sanitycheck-xr24@pipe-d-dp-1}:
- bat-dg2-8: [PASS][1] -> [FAIL][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13252/bat-dg2-8/igt@kms_pipe_crc_basic@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118947v4/bat-dg2-8/igt@kms_pipe_crc_basic@[email protected]
Known issues
------------
Here are the changes found in Patchwork_118947v4 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@i915_selftest@live@hangcheck:
- bat-dg2-11: [PASS][3] -> [ABORT][4] ([i915#7913] / [i915#7979])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13252/bat-dg2-11/igt@i915_selftest@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118947v4/bat-dg2-11/igt@i915_selftest@[email protected]
* igt@i915_selftest@live@reset:
- bat-rpls-2: [PASS][5] -> [ABORT][6] ([i915#4983] / [i915#7461] / [i915#7913] / [i915#7981] / [i915#8347])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13252/bat-rpls-2/igt@i915_selftest@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118947v4/bat-rpls-2/igt@i915_selftest@[email protected]
* igt@i915_selftest@live@slpc:
- bat-rpls-1: NOTRUN -> [DMESG-WARN][7] ([i915#6367])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118947v4/bat-rpls-1/igt@i915_selftest@[email protected]
* igt@i915_suspend@basic-s3-without-i915:
- bat-rpls-1: NOTRUN -> [ABORT][8] ([i915#6687] / [i915#7978])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118947v4/bat-rpls-1/igt@[email protected]
* igt@kms_chamelium_hpd@common-hpd-after-suspend:
- fi-bsw-nick: NOTRUN -> [SKIP][9] ([fdo#109271]) +1 similar issue
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118947v4/fi-bsw-nick/igt@[email protected]
#### Possible fixes ####
* igt@i915_selftest@live@execlists:
- fi-bsw-nick: [ABORT][10] ([i915#7911] / [i915#7913]) -> [PASS][11]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13252/fi-bsw-nick/igt@i915_selftest@[email protected]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118947v4/fi-bsw-nick/igt@i915_selftest@[email protected]
* igt@i915_selftest@live@reset:
- bat-rpls-1: [ABORT][12] ([i915#4983] / [i915#7461] / [i915#8347] / [i915#8384]) -> [PASS][13]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13252/bat-rpls-1/igt@i915_selftest@[email protected]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118947v4/bat-rpls-1/igt@i915_selftest@[email protected]
* igt@i915_selftest@live@workarounds:
- bat-rpls-1: [DMESG-FAIL][14] ([i915#7102]) -> [PASS][15]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13252/bat-rpls-1/igt@i915_selftest@[email protected]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118947v4/bat-rpls-1/igt@i915_selftest@[email protected]
* igt@kms_cursor_legacy@basic-flip-after-cursor-atomic:
- {bat-adlp-11}: [DMESG-WARN][16] ([i915#6868]) -> [PASS][17]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13252/bat-adlp-11/igt@[email protected]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118947v4/bat-adlp-11/igt@[email protected]
* igt@kms_cursor_legacy@basic-flip-after-cursor-legacy:
- {bat-adlp-11}: [SKIP][18] ([i915#3546]) -> [PASS][19]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13252/bat-adlp-11/igt@[email protected]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118947v4/bat-adlp-11/igt@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[i915#3546]: https://gitlab.freedesktop.org/drm/intel/issues/3546
[i915#3637]: https://gitlab.freedesktop.org/drm/intel/issues/3637
[i915#4309]: https://gitlab.freedesktop.org/drm/intel/issues/4309
[i915#4423]: https://gitlab.freedesktop.org/drm/intel/issues/4423
[i915#4983]: https://gitlab.freedesktop.org/drm/intel/issues/4983
[i915#6121]: https://gitlab.freedesktop.org/drm/intel/issues/6121
[i915#6367]: https://gitlab.freedesktop.org/drm/intel/issues/6367
[i915#6687]: https://gitlab.freedesktop.org/drm/intel/issues/6687
[i915#6868]: https://gitlab.freedesktop.org/drm/intel/issues/6868
[i915#7102]: https://gitlab.freedesktop.org/drm/intel/issues/7102
[i915#7461]: https://gitlab.freedesktop.org/drm/intel/issues/7461
[i915#7911]: https://gitlab.freedesktop.org/drm/intel/issues/7911
[i915#7913]: https://gitlab.freedesktop.org/drm/intel/issues/7913
[i915#7978]: https://gitlab.freedesktop.org/drm/intel/issues/7978
[i915#7979]: https://gitlab.freedesktop.org/drm/intel/issues/7979
[i915#7981]: https://gitlab.freedesktop.org/drm/intel/issues/7981
[i915#8347]: https://gitlab.freedesktop.org/drm/intel/issues/8347
[i915#8384]: https://gitlab.freedesktop.org/drm/intel/issues/8384
Build changes
-------------
* Linux: CI_DRM_13252 -> Patchwork_118947v4
CI-20190529: 20190529
CI_DRM_13252: 27187d09511e1d47dbaaf91c7332319551a8edab @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7322: 2dd77d6d827a308caae49ce3eba759c2bab394ed @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_118947v4: 27187d09511e1d47dbaaf91c7332319551a8edab @ git://anongit.freedesktop.org/gfx-ci/linux
### Linux commits
99754ead12af drm/i915/selftests: add local workqueue for SW fence selftest c655d9a0cc75 drm/i915: add a dedicated workqueue inside drm_i915_private 6cf781345133 drm/i915: use pointer to i915 instead of rpm in wakeref
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118947v4/index.html
Patchwork
CI[Intel-gfx] ✓ Fi.CI.IGT: success for drm/i915: implement internal workqueues (rev4)
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: drm/i915: implement internal workqueues (rev4)
URL : https://patchwork.freedesktop.org/series/118947/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_13252_full -> Patchwork_118947v4_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Participating hosts (7 -> 7)
------------------------------
No changes in participating hosts
Known issues
------------
Here are the changes found in Patchwork_118947v4_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_busy@close-race:
- shard-glk: [PASS][1] -> [DMESG-WARN][2] ([i915#118])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13252/shard-glk9/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118947v4/shard-glk2/igt@[email protected]
* igt@i915_pm_rps@reset:
- shard-snb: [PASS][3] -> [INCOMPLETE][4] ([i915#7790])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13252/shard-snb5/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118947v4/shard-snb4/igt@[email protected]
* igt@kms_flip@2x-flip-vs-expired-vblank-interruptible@bc-hdmi-a1-hdmi-a2:
- shard-glk: [PASS][5] -> [FAIL][6] ([i915#79])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13252/shard-glk1/igt@kms_flip@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118947v4/shard-glk4/igt@kms_flip@[email protected]
* igt@kms_plane_scaling@plane-scaler-with-clipping-clamping-pixel-formats@pipe-a-vga-1:
- shard-snb: NOTRUN -> [SKIP][7] ([fdo#109271]) +7 similar issues
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118947v4/shard-snb7/igt@kms_plane_scaling@plane-scaler-with-clipping-clamping-pixel-formats@pipe-a-vga-1.html
* igt@kms_plane_scaling@planes-downscale-factor-0-25@pipe-b-vga-1:
- shard-snb: NOTRUN -> [SKIP][8] ([fdo#109271] / [i915#4579]) +5 similar issues
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118947v4/shard-snb5/igt@kms_plane_scaling@[email protected]
#### Possible fixes ####
* igt@gem_exec_fair@basic-none@vcs0:
- {shard-rkl}: [FAIL][9] ([i915#2842]) -> [PASS][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13252/shard-rkl-6/igt@gem_exec_fair@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118947v4/shard-rkl-6/igt@gem_exec_fair@[email protected]
* igt@gem_exec_fair@basic-pace-share@rcs0:
- {shard-tglu}: [FAIL][11] ([i915#2842]) -> [PASS][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13252/shard-tglu-6/igt@gem_exec_fair@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118947v4/shard-tglu-9/igt@gem_exec_fair@[email protected]
* igt@gem_lmem_swapping@smem-oom@lmem0:
- {shard-dg1}: [TIMEOUT][13] ([i915#5493]) -> [PASS][14]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13252/shard-dg1-15/igt@gem_lmem_swapping@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118947v4/shard-dg1-12/igt@gem_lmem_swapping@[email protected]
* igt@gem_mmap_offset@clear@smem0:
- {shard-dg1}: [DMESG-WARN][15] ([i915#8304]) -> [PASS][16]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13252/shard-dg1-13/igt@gem_mmap_offset@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118947v4/shard-dg1-18/igt@gem_mmap_offset@[email protected]
* igt@i915_pm_lpsp@kms-lpsp@kms-lpsp-hdmi-a:
- {shard-rkl}: [SKIP][17] ([i915#1937] / [i915#4579]) -> [PASS][18]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13252/shard-rkl-1/igt@i915_pm_lpsp@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118947v4/shard-rkl-7/igt@i915_pm_lpsp@[email protected]
- {shard-dg1}: [SKIP][19] ([i915#1937] / [i915#4579]) -> [PASS][20]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13252/shard-dg1-12/igt@i915_pm_lpsp@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118947v4/shard-dg1-19/igt@i915_pm_lpsp@[email protected]
* igt@i915_pm_rpm@dpms-mode-unset-lpsp:
- {shard-rkl}: [SKIP][21] ([i915#1397]) -> [PASS][22]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13252/shard-rkl-1/igt@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118947v4/shard-rkl-7/igt@[email protected]
* igt@i915_selftest@live@gt_heartbeat:
- shard-apl: [DMESG-FAIL][23] ([i915#5334]) -> [PASS][24]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13252/shard-apl1/igt@i915_selftest@live@gt_heartbeat.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118947v4/shard-apl3/igt@i915_selftest@live@gt_heartbeat.html
* igt@kms_async_flips@alternate-sync-async-flip@pipe-a-hdmi-a-1:
- shard-glk: [FAIL][25] ([i915#2521]) -> [PASS][26]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13252/shard-glk1/igt@kms_async_flips@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118947v4/shard-glk4/igt@kms_async_flips@[email protected]
* igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions:
- shard-glk: [FAIL][27] ([i915#2346]) -> [PASS][28]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13252/shard-glk8/igt@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118947v4/shard-glk7/igt@[email protected]
- shard-apl: [FAIL][29] ([i915#2346]) -> [PASS][30]
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13252/shard-apl1/igt@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118947v4/shard-apl3/igt@[email protected]
* igt@kms_cursor_legacy@single-bo@pipe-b:
- {shard-dg1}: [INCOMPLETE][31] ([i915#8011] / [i915#8347]) -> [PASS][32]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13252/shard-dg1-19/igt@kms_cursor_legacy@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118947v4/shard-dg1-16/igt@kms_cursor_legacy@[email protected]
* igt@kms_flip@flip-vs-suspend-interruptible@d-hdmi-a4:
- {shard-dg1}: [DMESG-WARN][33] ([i915#4423]) -> [PASS][34]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13252/shard-dg1-18/igt@kms_flip@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118947v4/shard-dg1-17/igt@kms_flip@[email protected]
* igt@perf_pmu@most-busy-idle-check-all@bcs0:
- {shard-dg1}: [FAIL][35] ([i915#5234]) -> [PASS][36]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_13252/shard-dg1-15/igt@perf_pmu@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118947v4/shard-dg1-15/igt@perf_pmu@[email protected]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109289]: https://bugs.freedesktop.org/show_bug.cgi?id=109289
[fdo#110189]: https://bugs.freedesktop.org/show_bug.cgi?id=110189
[fdo#111825]: https://bugs.freedesktop.org/show_bug.cgi?id=111825
[i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072
[i915#118]: https://gitlab.freedesktop.org/drm/intel/issues/118
[i915#1397]: https://gitlab.freedesktop.org/drm/intel/issues/1397
[i915#1937]: https://gitlab.freedesktop.org/drm/intel/issues/1937
[i915#2346]: https://gitlab.freedesktop.org/drm/intel/issues/2346
[i915#2521]: https://gitlab.freedesktop.org/drm/intel/issues/2521
[i915#2575]: https://gitlab.freedesktop.org/drm/intel/issues/2575
[i915#2842]: https://gitlab.freedesktop.org/drm/intel/issues/2842
[i915#2876]: https://gitlab.freedesktop.org/drm/intel/issues/2876
[i915#3282]: https://gitlab.freedesktop.org/drm/intel/issues/3282
[i915#3458]: https://gitlab.freedesktop.org/drm/intel/issues/3458
[i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555
[i915#3638]: https://gitlab.freedesktop.org/drm/intel/issues/3638
[i915#3955]: https://gitlab.freedesktop.org/drm/intel/issues/3955
[i915#4070]: https://gitlab.freedesktop.org/drm/intel/issues/4070
[i915#4077]: https://gitlab.freedesktop.org/drm/intel/issues/4077
[i915#4078]: https://gitlab.freedesktop.org/drm/intel/issues/4078
[i915#4281]: https://gitlab.freedesktop.org/drm/intel/issues/4281
[i915#4391]: https://gitlab.freedesktop.org/drm/intel/issues/4391
[i915#4423]: https://gitlab.freedesktop.org/drm/intel/issues/4423
[i915#4538]: https://gitlab.freedesktop.org/drm/intel/issues/4538
[i915#4579]: https://gitlab.freedesktop.org/drm/intel/issues/4579
[i915#4816]: https://gitlab.freedesktop.org/drm/intel/issues/4816
[i915#4833]: https://gitlab.freedesktop.org/drm/intel/issues/4833
[i915#5176]: https://gitlab.freedesktop.org/drm/intel/issues/5176
[i915#5234]: https://gitlab.freedesktop.org/drm/intel/issues/5234
[i915#5235]: https://gitlab.freedesktop.org/drm/intel/issues/5235
[i915#5286]: https://gitlab.freedesktop.org/drm/intel/issues/5286
[i915#5334]: https://gitlab.freedesktop.org/drm/intel/issues/5334
[i915#5354]: https://gitlab.freedesktop.org/drm/intel/issues/5354
[i915#5493]: https://gitlab.freedesktop.org/drm/intel/issues/5493
[i915#6095]: https://gitlab.freedesktop.org/drm/intel/issues/6095
[i915#7561]: https://gitlab.freedesktop.org/drm/intel/issues/7561
[i915#7790]: https://gitlab.freedesktop.org/drm/intel/issues/7790
[i915#7828]: https://gitlab.freedesktop.org/drm/intel/issues/7828
[i915#79]: https://gitlab.freedesktop.org/drm/intel/issues/79
[i915#8011]: https://gitlab.freedesktop.org/drm/intel/issues/8011
[i915#8304]: https://gitlab.freedesktop.org/drm/intel/issues/8304
[i915#8347]: https://gitlab.freedesktop.org/drm/intel/issues/8347
Build changes
-------------
* Linux: CI_DRM_13252 -> Patchwork_118947v4
CI-20190529: 20190529
CI_DRM_13252: 27187d09511e1d47dbaaf91c7332319551a8edab @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7322: 2dd77d6d827a308caae49ce3eba759c2bab394ed @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_118947v4: 27187d09511e1d47dbaaf91c7332319551a8edab @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_118947v4/index.html
Jani Nikula
AppliedQuoted 1 line · Jani Nikula
This is v6 of [1], creating
i915->unordered_wqalso for mock devices.
Pushed to drm-intel-next. Thanks for the patches and review.
This also superseeds [1], and finally removes the last user of flush_scheduled_work().
Tetsuo, this will make its way to v6.5. Apologies about all the procrastination and delay.
BR,
Jani.
[1] https://patchwork.freedesktop.org/patch/msgid/[email protected]
Quoted 43 lines
BR,
Jani.[1] https://patchwork.freedesktop.org/series/118947/
Luca Coelho (3):
drm/i915: use pointer to i915 instead of rpm in wakeref drm/i915: add a dedicated workqueue insidedrm_i915_privatedrm/i915/selftests: add local workqueue for SW fence selftestdrivers/gpu/drm/i915/display/intel_display.c | 5 ++-- .../drm/i915/display/intel_display_driver.c | 2 +- drivers/gpu/drm/i915/display/intel_dmc.c | 2 +- drivers/gpu/drm/i915/display/intel_dp.c | 2 +- .../drm/i915/display/intel_dp_link_training.c | 3 ++- drivers/gpu/drm/i915/display/intel_drrs.c | 4 +++- drivers/gpu/drm/i915/display/intel_fbc.c | 2 +- drivers/gpu/drm/i915/display/intel_fbdev.c | 3 ++- drivers/gpu/drm/i915/display/intel_hdcp.c | 23 +++++++++++-------- drivers/gpu/drm/i915/display/intel_hotplug.c | 18 ++++++++++----- drivers/gpu/drm/i915/display/intel_opregion.c | 3 ++- drivers/gpu/drm/i915/display/intel_pps.c | 4 +++- drivers/gpu/drm/i915/display/intel_psr.c | 8 ++++--- drivers/gpu/drm/i915/gt/intel_engine_pm.c | 4 +--- .../drm/i915/gt/intel_execlists_submission.c | 5 ++-- .../gpu/drm/i915/gt/intel_gt_buffer_pool.c | 10 ++++---- drivers/gpu/drm/i915/gt/intel_gt_irq.c | 2 +- drivers/gpu/drm/i915/gt/intel_gt_pm.c | 2 +- drivers/gpu/drm/i915/gt/intel_gt_requests.c | 10 ++++---- drivers/gpu/drm/i915/gt/intel_reset.c | 2 +- drivers/gpu/drm/i915/gt/intel_rps.c | 20 ++++++++-------- drivers/gpu/drm/i915/gt/selftest_engine_cs.c | 2 +- drivers/gpu/drm/i915/i915_driver.c | 13 +++++++++++ drivers/gpu/drm/i915/i915_drv.h | 10 ++++++++ drivers/gpu/drm/i915/i915_request.c | 2 +- drivers/gpu/drm/i915/intel_runtime_pm.c | 2 +- drivers/gpu/drm/i915/intel_wakeref.c | 22 ++++++++++-------- drivers/gpu/drm/i915/intel_wakeref.h | 12 +++++----- .../gpu/drm/i915/selftests/i915_sw_fence.c | 16 ++++++++++--- .../gpu/drm/i915/selftests/mock_gem_device.c | 7 ++++++ 30 files changed, 143 insertions(+), 77 deletions(-)
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center