drm/vblank: Do not update vblank counts if vblanks are already disabled.
Subsystems (3)
PATCH v2 1/5 drm/vblank: Do not update vblank counts if vblanks are already disabled.
Updating the vblank counts requires register reads and these reads may not return meaningful values after the vblank interrupts are disabled as the device may go to low power state. An additional change would be to allow the driver to save the vblank counts before entering a low power state, but that's for the future.
Also, disable vblanks after reading the HW counter in the case where _crtc_vblank_off() is disabling vblanks.
--- drivers/gpu/drm/drm_vblank.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-)
drivers/gpu/drm/drm_vblank.c +9 -14
@@ -347,23 +347,14 @@ void drm_vblank_disable_and_save(struct drm_device *dev, unsigned int pipe)spin_lock_irqsave (&dev->vblank_time_lock, irqflags);/* -* Only disable vblank interrupts if they're enabled. This avoids -* calling the ->disable_vblank() operation in atomic context with the -* hardware potentially runtime suspended. -*/ -if (vblank->enabled) { -__disable_vblank (dev, pipe); - vblank->enabled = false; - } - -/* -* Always update the count and timestamp to maintain the +* Update the count and timestamp to maintain the * appearance that the counter has been ticking all along until * this time. This makes the count account for the entire time * between drm_crtc_vblank_on() and drm_crtc_vblank_off(). */ drm_update_vblank_count (dev, pipe, false); - +__disable_vblank (dev, pipe); + vblank->enabled = false;spin_unlock_irqrestore (&dev->vblank_time_lock, irqflags); }
@@ -1122,8 +1113,12 @@ void drm_crtc_vblank_off(struct drm_crtc *crtc) pipe, vblank->enabled, vblank->inmodeset);/* Avoid redundant vblank disables without previous -* drm_crtc_vblank_on(). */ -if (drm_core_check_feature (dev,DRIVER_ATOMIC ) || !vblank->inmodeset) +* drm_crtc_vblank_on() and only disable them if they're enabled. This +* avoids calling the ->disable_vblank() operation in atomic context +* with the hardware potentially runtime suspended. +*/ +if ((drm_core_check_feature (dev,DRIVER_ATOMIC ) || !vblank->inmodeset) && + vblank->enabled)drm_vblank_disable_and_save (dev, pipe);wake_up (&vblank->queue);
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 2/5 drm/vblank: Restoring vblank counts after device runtime PM events.
The HW frame counter can get reset when devices enters low power states and this messes up any following vblank count updates. So, compute the missed vblank interrupts for that low power state duration using time stamps. This is similar to _crtc_vblank_on() except that it doesn't enable vblank interrupts because this function is expected to be called from the driver _enable_vblank() vfunc.
--- drivers/gpu/drm/drm_vblank.c | 33 +++++++++++++++++++++++++++++++++ include/drm/drm_vblank.h | 1 + 2 files changed, 34 insertions(+)
drivers/gpu/drm/drm_vblank.c +33 -0
@@ -1230,6 +1230,39 @@ void drm_crtc_vblank_on(struct drm_crtc *crtc) }EXPORT_SYMBOL (drm_crtc_vblank_on); +void drm_crtc_vblank_restore (struct drm_device *dev,unsigned int pipe) +{ +ktime_t t_vblank; +struct drm_vblank_crtc *vblank; +int framedur_ns; +u64 diff_ns; +u32 cur_vblank, diff =1 ; +int count =DRM_TIMESTAMP_MAXRETRIES ; + +if (WARN_ON (pipe >= dev->num_crtcs)) +return ; + + vblank = &dev->vblank[pipe]; +WARN_ONCE ((drm_debug &DRM_UT_VBL ) && !vblank->framedur_ns, +"Cannot compute missed vblanks without frame duration\n" ); + framedur_ns = vblank->framedur_ns; + +do { + cur_vblank =__get_vblank_counter (dev, pipe); +drm_get_last_vbltimestamp (dev, pipe, &t_vblank, false); + }while (cur_vblank !=__get_vblank_counter (dev, pipe) && --count >0 ); + + diff_ns =ktime_to_ns (ktime_sub (t_vblank, vblank->time)); +if (framedur_ns) + diff =DIV_ROUND_CLOSEST_ULL (diff_ns, framedur_ns); + + +DRM_DEBUG_VBL ("missed %d vblanks in %lld ns, frame duration=%d ns, hw_diff=%d\n" , + diff, diff_ns, framedur_ns, cur_vblank - vblank->last); +store_vblank (dev, pipe, diff, t_vblank, cur_vblank); +} +EXPORT_SYMBOL (drm_crtc_vblank_restore); +static void drm_legacy_vblank_pre_modeset (struct drm_device *dev,unsigned int pipe) {
include/drm/drm_vblank.h +1 -0
@@ -180,6 +180,7 @@ void drm_crtc_vblank_off(struct drm_crtc *crtc);void drm_crtc_vblank_reset (struct drm_crtc *crtc);void drm_crtc_vblank_on (struct drm_crtc *crtc);u32 drm_crtc_accurate_vblank_count (struct drm_crtc *crtc); +void drm_crtc_vblank_restore (struct drm_device *dev,unsigned int pipe); bool drm_calc_vbltimestamp_from_scanoutpos(struct drm_device *dev, unsigned int pipe, int *max_error,
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 3/5 drm/i915: Use an atomic_t array to track power domain use count.
In reply to Dhinakaran PandiyanConvert the power_domains->domain_use_count array that tracks per-domain use count to atomic_t type. This is needed to be able to read/write the use counts outside of the power domain mutex.
--- drivers/gpu/drm/i915/i915_debugfs.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 2 +- drivers/gpu/drm/i915/intel_runtime_pm.c | 11 +++++------ 3 files changed, 7 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +1 -1
@@ -2772,7 +2772,7 @@ static int i915_power_domain_info(struct seq_file *m, void *unused)for_each_power_domain (power_domain, power_well->domains)seq_printf (m," %-23s %d\n" ,intel_display_power_domain_str (power_domain), - power_domains->domain_use_count[power_domain]); +atomic_read (&power_domains->domain_use_count[power_domain])); }mutex_unlock (&power_domains->lock);
drivers/gpu/drm/i915/i915_drv.h +1 -1
@@ -1490,7 +1490,7 @@ struct i915_power_domains {int power_well_count;struct mutex lock; -int domain_use_count[POWER_DOMAIN_NUM ]; +atomic_t domain_use_count[POWER_DOMAIN_NUM ];struct i915_power_well *power_wells; };
drivers/gpu/drm/i915/intel_runtime_pm.c +5 -6
@@ -1453,7 +1453,7 @@ __intel_display_power_get_domain(struct drm_i915_private *dev_priv,for_each_power_domain_well (dev_priv, power_well,BIT_ULL (domain))intel_power_well_get (dev_priv, power_well); - power_domains->domain_use_count[domain]++; +atomic_inc (&power_domains->domain_use_count[domain]); }/**
@@ -1539,10 +1539,9 @@ void intel_display_power_put(struct drm_i915_private *dev_priv,mutex_lock (&power_domains->lock); -WARN (!power_domains->domain_use_count[domain], -"Use count on domain %s is already zero\n" , +WARN (atomic_dec_return (&power_domains->domain_use_count[domain]) <0 , +"Use count on domain %s was already zero\n" ,intel_display_power_domain_str (domain)); - power_domains->domain_use_count[domain]--;for_each_power_domain_well_rev (dev_priv, power_well,BIT_ULL (domain))intel_power_well_put (dev_priv, power_well);
@@ -3049,7 +3048,7 @@ static void intel_power_domains_dump_info(struct drm_i915_private *dev_priv)for_each_power_domain (domain, power_well->domains)DRM_DEBUG_DRIVER (" %-23s %d\n" ,intel_display_power_domain_str (domain), - power_domains->domain_use_count[domain]); +atomic_read (&power_domains->domain_use_count[domain])); } }
@@ -3092,7 +3091,7 @@ void intel_power_domains_verify_state(struct drm_i915_private *dev_priv) domains_count =0 ;for_each_power_domain (domain, power_well->domains) - domains_count += power_domains->domain_use_count[domain]; + domains_count +=atomic_read (&power_domains->domain_use_count[domain]);if (power_well->count != domains_count) { DRM_ERROR("power well %s refcount/domain refcount mismatch "
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 4/5 drm/i915: Introduce a non-blocking power domain for vblank interrupts
In reply to Dhinakaran PandiyanWhen DC states are enabled and PSR is active, the hardware enters DC5/DC6 states resulting in frame counter resets. The frame counter resets mess up the vblank counting logic. So in order to disable DC states when vblank interrupts are required and to disallow DC states when vblanks interrupts are already enabled, introduce a new power domain. Since this power domain reference needs to be acquired and released in atomic context, the corresponding _get() and _put() methods skip the power_domain mutex.
--- drivers/gpu/drm/i915/i915_drv.h | 8 ++ drivers/gpu/drm/i915/intel_drv.h | 3 + drivers/gpu/drm/i915/intel_runtime_pm.c | 196 +++++++++++++++++++++++++++++--- 3 files changed, 193 insertions(+), 14 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +8 -0
@@ -397,6 +397,7 @@ enum intel_display_power_domain {POWER_DOMAIN_AUX_C ,POWER_DOMAIN_AUX_D ,POWER_DOMAIN_GMBUS , +POWER_DOMAIN_VBLANK ,POWER_DOMAIN_MODESET ,POWER_DOMAIN_GT_IRQ , POWER_DOMAIN_INIT,
@@ -1476,7 +1477,14 @@ struct i915_power_well { bool has_vga:1; bool has_fuses:1; } hsw; +struct { +bool was_disabled; + } dc_off; }; + +spinlock_t lock; +bool supports_atomic_ctx; +const struct i915_power_well_ops *ops; };
drivers/gpu/drm/i915/intel_drv.h +3 -0
@@ -1797,6 +1797,9 @@ bool intel_display_power_get_if_enabled(struct drm_i915_private *dev_priv, enum intel_display_power_domain domain);void intel_display_power_put (struct drm_i915_private *dev_priv,enum intel_display_power_domain domain); +void intel_display_power_vblank_get (struct drm_i915_private *dev_priv, +bool *needs_restore); +void intel_display_power_vblank_put (struct drm_i915_private *dev_priv);static inline void assert_rpm_device_not_suspended (struct drm_i915_private *dev_priv)
drivers/gpu/drm/i915/intel_runtime_pm.c +182 -14
396 lines not on this page · raw message
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 5/5 drm/i915: Use the vblank power domain disallow or disable DC states.
In reply to Dhinakaran PandiyanDisable DC states before enabling vblank interrupts and conversely enable DC states after disabling. Since the frame counter may have got reset between disabling and enabling, use drm_crtc_vblank_restore() to compute the missed vblanks.
--- drivers/gpu/drm/i915/i915_irq.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/gpu/drm/i915/i915_irq.c +6 -0
@@ -2963,6 +2963,11 @@ static int gen8_enable_vblank(struct drm_device *dev, unsigned int pipe) {struct drm_i915_private *dev_priv =to_i915 (dev);unsigned long irqflags; +bool needs_restore = false; + +intel_display_power_vblank_get (dev_priv, &needs_restore); +if (needs_restore) +drm_crtc_vblank_restore (dev, pipe);spin_lock_irqsave (&dev_priv->irq_lock, irqflags);bdw_enable_pipe_irq (dev_priv, pipe,GEN8_PIPE_VBLANK );
@@ -3015,6 +3020,7 @@ static void gen8_disable_vblank(struct drm_device *dev, unsigned int pipe)spin_lock_irqsave (&dev_priv->irq_lock, irqflags);bdw_disable_pipe_irq (dev_priv, pipe,GEN8_PIPE_VBLANK );spin_unlock_irqrestore (&dev_priv->irq_lock, irqflags); +intel_display_power_vblank_put (dev_priv); }static void ibx_irq_reset (struct drm_i915_private *dev_priv)
Signature · 6 lines
2.11.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: failure for series starting with [CI,v2,1/5] drm/vblank: Do not update vblank counts if vblanks are already disabled.
In reply to Dhinakaran Pandiyan== Series Details ==
== Series Details ==
Series: series starting with [CI,v2,1/5] drm/vblank: Do not update vblank counts if vblanks are already disabled.
URL : https://patchwork.freedesktop.org/series/35501/
State : failure
== Summary ==
Series 35501v1 series starting with [CI,v2,1/5] drm/vblank: Do not update vblank counts if vblanks are already disabled.
https://patchwork.freedesktop.org/api/1.0/series/35501/revisions/1/mbox/
Test debugfs_test:
Subgroup read_all_entries:
pass -> INCOMPLETE (fi-snb-2520m) fdo#103713
Test gem_exec_suspend:
Subgroup basic-s3:
pass -> INCOMPLETE (fi-bxt-j4205)
Test kms_psr_sink_crc:
Subgroup psr_basic:
dmesg-warn -> PASS (fi-skl-6700hq) fdo#101144fdo#103713 https://bugs.freedesktop.org/show_bug.cgi?id=103713
fdo#101144 https://bugs.freedesktop.org/show_bug.cgi?id=101144
fi-bdw-5557u total:288 pass:267 dwarn:0 dfail:0 fail:0 skip:21 time:432s fi-bdw-gvtdvm total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:435s fi-blb-e6850 total:288 pass:223 dwarn:1 dfail:0 fail:0 skip:64 time:391s fi-bsw-n3050 total:288 pass:242 dwarn:0 dfail:0 fail:0 skip:46 time:496s fi-bwr-2160 total:288 pass:183 dwarn:0 dfail:0 fail:0 skip:105 time:275s fi-bxt-dsi total:288 pass:258 dwarn:0 dfail:0 fail:0 skip:30 time:495s fi-bxt-j4205 total:108 pass:96 dwarn:0 dfail:0 fail:0 skip:11 fi-byt-j1900 total:288 pass:253 dwarn:0 dfail:0 fail:0 skip:35 time:479s fi-byt-n2820 total:288 pass:249 dwarn:0 dfail:0 fail:0 skip:39 time:466s fi-elk-e7500 total:224 pass:163 dwarn:15 dfail:0 fail:0 skip:45 fi-gdg-551 total:7 pass:5 dwarn:1 dfail:0 fail:0 skip:0 fi-glk-1 total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:533s fi-hsw-4770 total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:403s fi-hsw-4770r total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:412s fi-ilk-650 total:288 pass:228 dwarn:0 dfail:0 fail:0 skip:60 time:384s fi-ivb-3520m total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:466s fi-ivb-3770 total:288 pass:255 dwarn:0 dfail:0 fail:0 skip:33 time:431s fi-kbl-7500u total:288 pass:263 dwarn:1 dfail:0 fail:0 skip:24 time:479s fi-kbl-7560u total:288 pass:268 dwarn:1 dfail:0 fail:0 skip:19 time:515s fi-kbl-7567u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:466s fi-kbl-r total:288 pass:260 dwarn:1 dfail:0 fail:0 skip:27 time:520s fi-pnv-d510 total:288 pass:222 dwarn:1 dfail:0 fail:0 skip:65 time:579s fi-skl-6260u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:443s fi-skl-6600u total:288 pass:260 dwarn:1 dfail:0 fail:0 skip:27 time:535s fi-skl-6700hq total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:557s fi-skl-6700k2 total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:506s fi-skl-6770hq total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:503s fi-skl-gvtdvm total:288 pass:265 dwarn:0 dfail:0 fail:0 skip:23 time:443s fi-snb-2520m total:3 pass:2 dwarn:0 dfail:0 fail:0 skip:0 fi-snb-2600 total:288 pass:248 dwarn:0 dfail:0 fail:0 skip:40 time:415s Blacklisted hosts: fi-cfl-s2 total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:596s fi-glk-dsi total:20 pass:19 dwarn:0 dfail:0 fail:0 skip:0
780afbc71018cfa8cca45143c55b2051330402b6 drm-tip: 2017y-12m-18d-09h-33m-33s UTC integration manifest bea77cd5e63e drm/i915: Use the vblank power domain disallow or disable DC states. 43de979e3ce8 drm/i915: Introduce a non-blocking power domain for vblank interrupts 5c292379a9e9 drm/i915: Use an atomic_t array to track power domain use count. fabd57888ef8 drm/vblank: Restoring vblank counts after device runtime PM events. 673aa493d715 drm/vblank: Do not update vblank counts if vblanks are already disabled.
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7522/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx