drm/i915: Remove support for legacy debugfs crc interface
Subsystems (2)
PATCH 1/2 drm/i915: Remove support for legacy debugfs crc interface
This interface is deprecated, and has been replaced by the upstream drm crc interface.
--- drivers/gpu/drm/i915/i915_debugfs.c | 7 +- drivers/gpu/drm/i915/i915_drv.h | 11 +- drivers/gpu/drm/i915/i915_irq.c | 79 ++--- drivers/gpu/drm/i915/intel_drv.h | 2 - drivers/gpu/drm/i915/intel_pipe_crc.c | 445 -------------------------- 5 files changed, 24 insertions(+), 520 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +1 -6
@@ -4799,7 +4799,6 @@ static const struct i915_debugfs_files {#endif {"i915_fifo_underrun_reset", &i915_fifo_underrun_reset_ops}, {"i915_next_seqno", &i915_next_seqno_fops}, - {"i915_display_crc_ctl", &i915_display_crc_ctl_fops}, {"i915_pri_wm_latency", &i915_pri_wm_latency_fops}, {"i915_spr_wm_latency", &i915_spr_wm_latency_fops}, {"i915_cur_wm_latency", &i915_cur_wm_latency_fops},
@@ -4819,7 +4818,7 @@ int i915_debugfs_register(struct drm_i915_private *dev_priv) {struct drm_minor *minor = dev_priv->drm.primary;struct dentry *ent; -int ret, i; +int i; ent = debugfs_create_file("i915_forcewake_user", S_IRUSR, minor->debugfs_root, to_i915(minor->dev),
@@ -4827,10 +4826,6 @@ int i915_debugfs_register(struct drm_i915_private *dev_priv)if (!ent)return -ENOMEM ; - ret =intel_pipe_crc_create (minor); -if (ret) -return ret; -for (i =0 ; i <ARRAY_SIZE (i915_debugfs_files); i++) { ent = debugfs_create_file(i915_debugfs_files[i].name, S_IRUGO | S_IWUSR,
drivers/gpu/drm/i915/i915_drv.h +1 -10
@@ -1276,20 +1276,11 @@ enum intel_pipe_crc_source { INTEL_PIPE_CRC_SOURCE_MAX, }; -struct intel_pipe_crc_entry { -uint32_t frame; -uint32_t crc[5 ]; -}; -#define INTEL_PIPE_CRC_ENTRIES_NR 128struct intel_pipe_crc {spinlock_t lock; -bool opened;/* exclusive access to the result file */ -struct intel_pipe_crc_entry *entries; -enum intel_pipe_crc_source source; -int head, tail; -wait_queue_head_t wq;int skipped; +enum intel_pipe_crc_source source; };struct i915_frontbuffer_tracking {
drivers/gpu/drm/i915/i915_irq.c +22 -57
91 lines not on this page · raw message
drivers/gpu/drm/i915/intel_drv.h +0 -2
@@ -2152,7 +2152,6 @@ void lspcon_resume(struct intel_lspcon *lspcon);void lspcon_wait_pcon_mode (struct intel_lspcon *lspcon);/* intel_pipe_crc.c */ -int intel_pipe_crc_create (struct drm_minor *minor);#ifdef CONFIG_DEBUG_FS int intel_crtc_set_crc_source (struct drm_crtc *crtc,const char *source_name,size_t *values_cnt);
@@ -2168,5 +2167,4 @@ static inline void intel_crtc_enable_pipe_crc(struct intel_crtc *crtc) { }#endif -extern const struct file_operations i915_display_crc_ctl_fops;#endif /* __INTEL_DRV_H__ */
drivers/gpu/drm/i915/intel_pipe_crc.c +0 -445
477 lines not on this page · raw message
Signature · 6 lines
2.18.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/2 drm/i915: Replace use of pipe_crc->lock with an atomic
pipe_crc->lock only protects pipe_crc->skipped. Replace the lock with atomic operations instead, it should work just as well, without the spinlock. In the case we don't skip CRC in the irq, the fastpath is only a single atomic_read().
--- drivers/gpu/drm/i915/i915_drv.c | 1 - drivers/gpu/drm/i915/i915_drv.h | 5 +---- drivers/gpu/drm/i915/i915_irq.c | 15 ++++++++------- drivers/gpu/drm/i915/intel_pipe_crc.c | 20 +++----------------- 4 files changed, 12 insertions(+), 29 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +0 -1
@@ -923,7 +923,6 @@ static int i915_driver_init_early(struct drm_i915_private *dev_priv,intel_init_display_hooks (dev_priv);intel_init_clock_gating_hooks (dev_priv);intel_init_audio_hooks (dev_priv); -intel_display_crc_init (dev_priv);intel_detect_preproduction_hw (dev_priv);
drivers/gpu/drm/i915/i915_drv.h +1 -4
@@ -1278,8 +1278,7 @@ enum intel_pipe_crc_source {#define INTEL_PIPE_CRC_ENTRIES_NR 128struct intel_pipe_crc { -spinlock_t lock; -int skipped; +atomic_t skipped;enum intel_pipe_crc_source source; };
@@ -3335,12 +3334,10 @@ u32 i915_gem_fence_alignment(struct drm_i915_private *dev_priv, u32 size,#ifdef CONFIG_DEBUG_FS int i915_debugfs_register (struct drm_i915_private *dev_priv);int i915_debugfs_connector_add (struct drm_connector *connector); -void intel_display_crc_init (struct drm_i915_private *dev_priv);#else static inline int i915_debugfs_register (struct drm_i915_private *dev_priv) {return 0 ;}static inline int i915_debugfs_connector_add (struct drm_connector *connector) {return 0 ; } -static inline void intel_display_crc_init (struct drm_i915_private *dev_priv) {}#endif const char *i915_cache_level_str (struct drm_i915_private *i915,int type);
drivers/gpu/drm/i915/i915_irq.c +8 -7
@@ -1705,8 +1705,8 @@ static void display_pipe_crc_irq_handler(struct drm_i915_private *dev_priv,struct intel_pipe_crc *pipe_crc = &dev_priv->pipe_crc[pipe];struct intel_crtc *crtc =intel_get_crtc_for_pipe (dev_priv, pipe);uint32_t crcs[5 ]; +int to_skip; -spin_lock (&pipe_crc->lock);/* * For some not yet identified reason, the first CRC is * bonkers. So let's just wait for the next vblank and read
@@ -1715,13 +1715,14 @@ static void display_pipe_crc_irq_handler(struct drm_i915_private *dev_priv,* On GEN8+ sometimes the second CRC is bonkers as well, so * don't trust that one either. */ -if (pipe_crc->skipped <=0 || - (INTEL_GEN (dev_priv) >=8 && pipe_crc->skipped ==1 )) { - pipe_crc->skipped++; -spin_unlock (&pipe_crc->lock); + +if (INTEL_GEN (dev_priv) >=8 ) + to_skip =2 ; +else + to_skip =1 ; + +if (atomic_add_unless (&pipe_crc->skipped,1 , to_skip))return ; - } -spin_unlock (&pipe_crc->lock); crcs[0 ] = crc0; crcs[1 ] = crc1;
drivers/gpu/drm/i915/intel_pipe_crc.c +3 -17
@@ -457,17 +457,6 @@ display_crc_ctl_parse_source(const char *buf, enum intel_pipe_crc_source *s)return 0 ; } -void intel_display_crc_init (struct drm_i915_private *dev_priv) -{ -enum pipe pipe; - -for_each_pipe (dev_priv, pipe) { -struct intel_pipe_crc *pipe_crc = &dev_priv->pipe_crc[pipe]; - -spin_lock_init (&pipe_crc->lock); - } -} -int intel_crtc_set_crc_source (struct drm_crtc *crtc,const char *source_name,size_t *values_cnt) {
@@ -507,7 +496,7 @@ int intel_crtc_set_crc_source(struct drm_crtc *crtc, const char *source_name,hsw_pipe_A_crc_wa (dev_priv, false); } - pipe_crc->skipped =0 ; +atomic_set (&pipe_crc->skipped,0 ); *values_cnt =5 ; out:
@@ -529,8 +518,7 @@ void intel_crtc_enable_pipe_crc(struct intel_crtc *intel_crtc)if (get_new_crc_ctl_reg (dev_priv, crtc->index, &pipe_crc->source, &val, false) <0 )return ; -/* Don't need pipe_crc->lock here, IRQs are not generated. */ - pipe_crc->skipped =0 ; +atomic_set (&pipe_crc->skipped,0 );I915_WRITE (PIPE_CRC_CTL (crtc->index), val);POSTING_READ (PIPE_CRC_CTL (crtc->index));
@@ -543,9 +531,7 @@ void intel_crtc_disable_pipe_crc(struct intel_crtc *intel_crtc)struct intel_pipe_crc *pipe_crc = &dev_priv->pipe_crc[crtc->index];/* Swallow crc's until we stop generating them. */ -spin_lock_irq (&pipe_crc->lock); - pipe_crc->skipped =INT_MIN ; -spin_unlock_irq (&pipe_crc->lock); +atomic_set (&pipe_crc->skipped,INT_MIN );I915_WRITE (PIPE_CRC_CTL (crtc->index),0 );POSTING_READ (PIPE_CRC_CTL (crtc->index));
Signature · 6 lines
2.18.0 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.CHECKPATCH: warning for series starting with [1/2] drm/i915: Remove support for legacy debugfs crc interface
In reply to Maarten Lankhorst== Series Details ==
== Series Details ==
Series: series starting with [1/2] drm/i915: Remove support for legacy debugfs crc interface
URL : https://patchwork.freedesktop.org/series/45553/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip 6428445ab929 drm/i915: Remove support for legacy debugfs crc interface -:168: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #168: FILE: drivers/gpu/drm/i915/i915_irq.c:1769: + drm_crtc_add_crc_entry(&crtc->base, true, + drm_crtc_accurate_vblank_count(&crtc->base),
total: 0 errors, 0 warnings, 1 checks, 626 lines checked 107c66964ccb drm/i915: Replace use of pipe_crc->lock with an atomic
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.SPARSE: warning for series starting with [1/2] drm/i915: Remove support for legacy debugfs crc interface
In reply to Maarten Lankhorst== Series Details ==
== Series Details ==
Series: series starting with [1/2] drm/i915: Remove support for legacy debugfs crc interface
URL : https://patchwork.freedesktop.org/series/45553/
State : warning
== Summary ==
$ dim sparse origin/drm-tip Commit: drm/i915: Remove support for legacy debugfs crc interface -drivers/gpu/drm/i915/selftests/../i915_drv.h:3672:16: warning: expression using sizeof(void) +drivers/gpu/drm/i915/selftests/../i915_drv.h:3663:16: warning: expression using sizeof(void) -./include/linux/slab.h:631:13: error: undefined identifier '__builtin_mul_overflow' -./include/linux/slab.h:631:13: warning: call with no type!
Commit: drm/i915: Replace use of pipe_crc->lock with an atomic -drivers/gpu/drm/i915/selftests/../i915_drv.h:3663:16: warning: expression using sizeof(void) +drivers/gpu/drm/i915/selftests/../i915_drv.h:3660:16: warning: expression using sizeof(void)
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for series starting with [1/2] drm/i915: Remove support for legacy debugfs crc interface
In reply to Maarten Lankhorst== Series Details ==
== Series Details ==
Series: series starting with [1/2] drm/i915: Remove support for legacy debugfs crc interface
URL : https://patchwork.freedesktop.org/series/45553/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4396 -> Patchwork_9459 =
== Summary - SUCCESS ==
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/45553/revisions/1/mbox/
== Known issues ==
Here are the changes found in Patchwork_9459 that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@prime_vgem@basic-fence-flip:
fi-ilk-650: PASS -> FAIL (fdo#104008)fdo#104008 https://bugs.freedesktop.org/show_bug.cgi?id=104008
== Participating hosts (43 -> 39) ==
Missing (4): fi-ctg-p8600 fi-ilk-m540 fi-byt-squawks fi-hsw-4200u
== Build changes ==
* Linux: CI_DRM_4396 -> Patchwork_9459
CI_DRM_4396: dd5f49f9686f412baa426502d417ac74a37fc77e @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4530: 0e98bf69f146eb72fe3a7c3b19a049b5786f0ca3 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9459: 107c66964ccb63a1faf7cde7381cd533ddd8b237 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
107c66964ccb drm/i915: Replace use of pipe_crc->lock with an atomic 6428445ab929 drm/i915: Remove support for legacy debugfs crc interface
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9459/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 9 lines · Maarten Lankhorst
This interface is deprecated, and has been replaced by the upstream drm crc interface.
Signed-off-by Maarten Lankhorst <[email protected]>Cc Tomi Sarvela <[email protected]>Cc Petri Latvala <[email protected]>Cc Jani Nikula <[email protected]>Cc Ville Syrjälä <[email protected]>Acked-by Ville Syrjälä <[email protected]>
Quoted 666 lines
--- drivers/gpu/drm/i915/i915_debugfs.c | 7 +- drivers/gpu/drm/i915/i915_drv.h | 11 +- drivers/gpu/drm/i915/i915_irq.c | 79 ++--- drivers/gpu/drm/i915/intel_drv.h | 2 - drivers/gpu/drm/i915/intel_pipe_crc.c | 445 -------------------------- 5 files changed, 24 insertions(+), 520 deletions(-)drivers/gpu/drm/i915/i915_debugfs.c +1
-6@@ -4799,7 +4799,6 @@ static const struct i915_debugfs_files {#endif {"i915_fifo_underrun_reset", &i915_fifo_underrun_reset_ops}, {"i915_next_seqno", &i915_next_seqno_fops}, - {"i915_display_crc_ctl", &i915_display_crc_ctl_fops}, {"i915_pri_wm_latency", &i915_pri_wm_latency_fops}, {"i915_spr_wm_latency", &i915_spr_wm_latency_fops}, {"i915_cur_wm_latency", &i915_cur_wm_latency_fops},@@ -4819,7 +4818,7 @@ int i915_debugfs_register(struct drm_i915_private *dev_priv) {struct drm_minor *minor = dev_priv->drm.primary;struct dentry *ent; -int ret, i; +int i; ent = debugfs_create_file("i915_forcewake_user", S_IRUSR, minor->debugfs_root, to_i915(minor->dev),@@ -4827,10 +4826,6 @@ int i915_debugfs_register(struct drm_i915_private *dev_priv)if (!ent)return -ENOMEM ; - ret =intel_pipe_crc_create (minor); -if (ret) -return ret; -for (i =0 ; i <ARRAY_SIZE (i915_debugfs_files); i++) { ent = debugfs_create_file(i915_debugfs_files[i].name, S_IRUGO | S_IWUSR,drivers/gpu/drm/i915/i915_drv.h +1
-10@@ -1276,20 +1276,11 @@ enum intel_pipe_crc_source { INTEL_PIPE_CRC_SOURCE_MAX, }; -struct intel_pipe_crc_entry { -uint32_t frame; -uint32_t crc[5 ]; -}; -#define INTEL_PIPE_CRC_ENTRIES_NR 128struct intel_pipe_crc {spinlock_t lock; -bool opened;/* exclusive access to the result file */ -struct intel_pipe_crc_entry *entries; -enum intel_pipe_crc_source source; -int head, tail; -wait_queue_head_t wq;int skipped; +enum intel_pipe_crc_source source; };struct i915_frontbuffer_tracking {drivers/gpu/drm/i915/i915_irq.c +22
-57@@ -1703,69 +1703,34 @@ static void display_pipe_crc_irq_handler(struct drm_i915_private *dev_priv, uint32_t crc4) {struct intel_pipe_crc *pipe_crc = &dev_priv->pipe_crc[pipe]; -struct intel_pipe_crc_entry *entry;struct intel_crtc *crtc =intel_get_crtc_for_pipe (dev_priv, pipe); -struct drm_driver *driver = dev_priv->drm.driver;uint32_t crcs[5 ]; -int head, tail;spin_lock (&pipe_crc->lock); -if (pipe_crc->source && !crtc->base.crc.opened) { -if (!pipe_crc->entries) { -spin_unlock (&pipe_crc->lock); -DRM_DEBUG_KMS ("spurious interrupt\n" ); -return ; - } - - head = pipe_crc->head; - tail = pipe_crc->tail; - -if (CIRC_SPACE (head, tail,INTEL_PIPE_CRC_ENTRIES_NR ) <1 ) { -spin_unlock (&pipe_crc->lock); -DRM_ERROR ("CRC buffer overflowing\n" ); -return ; - } - - entry = &pipe_crc->entries[head]; - - entry->frame = driver->get_vblank_counter (&dev_priv->drm, pipe); - entry->crc[0 ] = crc0; - entry->crc[1 ] = crc1; - entry->crc[2 ] = crc2; - entry->crc[3 ] = crc3; - entry->crc[4 ] = crc4; - - head = (head +1 ) & (INTEL_PIPE_CRC_ENTRIES_NR -1 ); - pipe_crc->head = head; - -spin_unlock (&pipe_crc->lock); - -wake_up_interruptible (&pipe_crc->wq); - }else { -/* -* For some not yet identified reason, the first CRC is -* bonkers. So let's just wait for the next vblank and read -* out the buggy result. -* -* On GEN8+ sometimes the second CRC is bonkers as well, so -* don't trust that one either. -*/ -if (pipe_crc->skipped <=0 || - (INTEL_GEN (dev_priv) >=8 && pipe_crc->skipped ==1 )) { - pipe_crc->skipped++; -spin_unlock (&pipe_crc->lock); -return ; - } +/* +* For some not yet identified reason, the first CRC is +* bonkers. So let's just wait for the next vblank and read +* out the buggy result. +* +* On GEN8+ sometimes the second CRC is bonkers as well, so +* don't trust that one either. +*/ +if (pipe_crc->skipped <=0 || + (INTEL_GEN (dev_priv) >=8 && pipe_crc->skipped ==1 )) { + pipe_crc->skipped++;spin_unlock (&pipe_crc->lock); - crcs[0 ] = crc0; - crcs[1 ] = crc1; - crcs[2 ] = crc2; - crcs[3 ] = crc3; - crcs[4 ] = crc4; -drm_crtc_add_crc_entry (&crtc->base, true, -drm_crtc_accurate_vblank_count (&crtc->base), - crcs); +return ; } +spin_unlock (&pipe_crc->lock); + + crcs[0 ] = crc0; + crcs[1 ] = crc1; + crcs[2 ] = crc2; + crcs[3 ] = crc3; + crcs[4 ] = crc4; +drm_crtc_add_crc_entry (&crtc->base, true, +drm_crtc_accurate_vblank_count (&crtc->base), + crcs); }#else static inline voiddrivers/gpu/drm/i915/intel_drv.h +0
-2@@ -2152,7 +2152,6 @@ void lspcon_resume(struct intel_lspcon *lspcon);void lspcon_wait_pcon_mode (struct intel_lspcon *lspcon);/* intel_pipe_crc.c */ -int intel_pipe_crc_create (struct drm_minor *minor);#ifdef CONFIG_DEBUG_FS int intel_crtc_set_crc_source (struct drm_crtc *crtc,const char *source_name,size_t *values_cnt);@@ -2168,5 +2167,4 @@ static inline void intel_crtc_enable_pipe_crc(struct intel_crtc *crtc) { }#endif -extern const struct file_operations i915_display_crc_ctl_fops;#endif /* __INTEL_DRV_H__ */ drivers/gpu/drm/i915/intel_pipe_crc.c +0
-445@@ -30,160 +30,6 @@#include <linux/debugfs.h> #include "intel_drv.h" -struct pipe_crc_info { -const char *name; -struct drm_i915_private *dev_priv; -enum pipe pipe; -}; - -static int i915_pipe_crc_open (struct inode *inode,struct file *filep) -{ -struct pipe_crc_info *info = inode->i_private; -struct drm_i915_private *dev_priv = info->dev_priv; -struct intel_pipe_crc *pipe_crc = &dev_priv->pipe_crc[info->pipe]; - -if (info->pipe >=INTEL_INFO (dev_priv)->num_pipes) -return -ENODEV ; - -spin_lock_irq (&pipe_crc->lock); - -if (pipe_crc->opened) { -spin_unlock_irq (&pipe_crc->lock); -return -EBUSY ;/* already open */ - } - - pipe_crc->opened = true; - filep->private_data = inode->i_private; - -spin_unlock_irq (&pipe_crc->lock); - -return 0 ; -} - -static int i915_pipe_crc_release (struct inode *inode,struct file *filep) -{ -struct pipe_crc_info *info = inode->i_private; -struct drm_i915_private *dev_priv = info->dev_priv; -struct intel_pipe_crc *pipe_crc = &dev_priv->pipe_crc[info->pipe]; - -spin_lock_irq (&pipe_crc->lock); - pipe_crc->opened = false; -spin_unlock_irq (&pipe_crc->lock); - -return 0 ; -} - -/* (6 fields, 8 chars each, space separated (5) + '\n') */ -#define PIPE_CRC_LINE_LEN (6 * 8 + 5 + 1) -/* account for \'0' */ -#define PIPE_CRC_BUFFER_LEN (PIPE_CRC_LINE_LEN + 1) - -static int pipe_crc_data_count (struct intel_pipe_crc *pipe_crc) -{ -lockdep_assert_held (&pipe_crc->lock); -return CIRC_CNT (pipe_crc->head, pipe_crc->tail, -INTEL_PIPE_CRC_ENTRIES_NR ); -} - -static ssize_t -i915_pipe_crc_read (struct file *filep,char __user *user_buf,size_t count, -loff_t *pos) -{ -struct pipe_crc_info *info = filep->private_data; -struct drm_i915_private *dev_priv = info->dev_priv; -struct intel_pipe_crc *pipe_crc = &dev_priv->pipe_crc[info->pipe]; -char buf[PIPE_CRC_BUFFER_LEN ]; -int n_entries; -ssize_t bytes_read; - -/* -* Don't allow user space to provide buffers not big enough to hold -* a line of data. -*/ -if (count <PIPE_CRC_LINE_LEN ) -return -EINVAL ; - -if (pipe_crc->source ==INTEL_PIPE_CRC_SOURCE_NONE ) -return 0 ; - -/* nothing to read */ -spin_lock_irq (&pipe_crc->lock); -while (pipe_crc_data_count (pipe_crc) ==0 ) { -int ret; - -if (filep->f_flags &O_NONBLOCK ) { -spin_unlock_irq (&pipe_crc->lock); -return -EAGAIN ; - } - - ret =wait_event_interruptible_lock_irq (pipe_crc->wq, -pipe_crc_data_count (pipe_crc), pipe_crc->lock); -if (ret) { -spin_unlock_irq (&pipe_crc->lock); -return ret; - } - } - -/* We now have one or more entries to read */ - n_entries = count /PIPE_CRC_LINE_LEN ; - - bytes_read =0 ; -while (n_entries >0 ) { -struct intel_pipe_crc_entry *entry = - &pipe_crc->entries[pipe_crc->tail]; - -if (CIRC_CNT (pipe_crc->head, pipe_crc->tail, -INTEL_PIPE_CRC_ENTRIES_NR ) <1 ) -break ; - -BUILD_BUG_ON_NOT_POWER_OF_2 (INTEL_PIPE_CRC_ENTRIES_NR ); - pipe_crc->tail = (pipe_crc->tail +1 ) & - (INTEL_PIPE_CRC_ENTRIES_NR -1 ); - - bytes_read +=snprintf (buf,PIPE_CRC_BUFFER_LEN , -"%8u %8x %8x %8x %8x %8x\n" , - entry->frame, entry->crc[0 ], - entry->crc[1 ], entry->crc[2 ], - entry->crc[3 ], entry->crc[4 ]); - -spin_unlock_irq (&pipe_crc->lock); - -if (copy_to_user (user_buf, buf,PIPE_CRC_LINE_LEN )) -return -EFAULT ; - - user_buf +=PIPE_CRC_LINE_LEN ; - n_entries--; - -spin_lock_irq (&pipe_crc->lock); - } - -spin_unlock_irq (&pipe_crc->lock); - -return bytes_read; -} - -static const struct file_operations i915_pipe_crc_fops = { - .owner =THIS_MODULE , - .open = i915_pipe_crc_open, - .read = i915_pipe_crc_read, - .release = i915_pipe_crc_release, -}; - -static struct pipe_crc_info i915_pipe_crc_data[I915_MAX_PIPES ] = { - { - .name ="i915_pipe_A_crc" , - .pipe =PIPE_A , - }, - { - .name ="i915_pipe_B_crc" , - .pipe =PIPE_B , - }, - { - .name ="i915_pipe_C_crc" , - .pipe =PIPE_C , - }, -}; -static const char *const pipe_crc_sources[] = {"none" ,"plane1" ,@@ -197,29 +43,6 @@ static const char * const pipe_crc_sources[] = { "auto", }; -static const char *pipe_crc_source_name (enum intel_pipe_crc_source source) -{ -BUILD_BUG_ON (ARRAY_SIZE (pipe_crc_sources) !=INTEL_PIPE_CRC_SOURCE_MAX ); -return pipe_crc_sources[source]; -} - -static int display_crc_ctl_show (struct seq_file *m,void *data) -{ -struct drm_i915_private *dev_priv = m->private; -enum pipe pipe; - -for_each_pipe (dev_priv, pipe) -seq_printf (m,"%c %s\n" ,pipe_name (pipe), -pipe_crc_source_name (dev_priv->pipe_crc[pipe].source)); - -return 0 ; -} - -static int display_crc_ctl_open (struct inode *inode,struct file *file) -{ -return single_open (file, display_crc_ctl_show, inode->i_private); -} -static int i8xx_pipe_crc_ctl_reg (enum intel_pipe_crc_source *source,uint32_t *val) {@@ -616,177 +439,6 @@ static int get_new_crc_ctl_reg(struct drm_i915_private *dev_priv,return ivb_pipe_crc_ctl_reg (dev_priv, pipe, source, val, set_wa); } -static int pipe_crc_set_source (struct drm_i915_private *dev_priv, -enum pipe pipe, -enum intel_pipe_crc_source source) -{ -struct intel_pipe_crc *pipe_crc = &dev_priv->pipe_crc[pipe]; -enum intel_display_power_domain power_domain; -u32 val =0 ;/* shut up gcc */ -int ret; - -if (pipe_crc->source == source) -return 0 ; - -/* forbid changing the source without going back to 'none' */ -if (pipe_crc->source && source) -return -EINVAL ; - - power_domain =POWER_DOMAIN_PIPE (pipe); -if (!intel_display_power_get_if_enabled (dev_priv, power_domain)) { -DRM_DEBUG_KMS ("Trying to capture CRC while pipe is off\n" ); -return -EIO ; - } - - ret =get_new_crc_ctl_reg (dev_priv, pipe, &source, &val, true); -if (ret !=0 ) - goto out; - -/* none -> real source transition */ -if (source) { -struct intel_pipe_crc_entry *entries; - -DRM_DEBUG_DRIVER ("collecting CRCs for pipe %c, %s\n" , -pipe_name (pipe),pipe_crc_source_name (source)); - - entries =kcalloc (INTEL_PIPE_CRC_ENTRIES_NR , -sizeof (pipe_crc->entries[0 ]), -GFP_KERNEL ); -if (!entries) { - ret = -ENOMEM ; - goto out; - } - -spin_lock_irq (&pipe_crc->lock); -kfree (pipe_crc->entries); - pipe_crc->entries = entries; - pipe_crc->head =0 ; - pipe_crc->tail =0 ; -spin_unlock_irq (&pipe_crc->lock); - } - - pipe_crc->source = source; - -I915_WRITE (PIPE_CRC_CTL (pipe), val); -POSTING_READ (PIPE_CRC_CTL (pipe)); - -/* real source -> none transition */ -if (!source) { -struct intel_pipe_crc_entry *entries; -struct intel_crtc *crtc =intel_get_crtc_for_pipe (dev_priv, - pipe); - -DRM_DEBUG_DRIVER ("stopping CRCs for pipe %c\n" , -pipe_name (pipe)); - -drm_modeset_lock (&crtc->base.mutex,NULL ); -if (crtc->base.state->active) -intel_wait_for_vblank (dev_priv, pipe); -drm_modeset_unlock (&crtc->base.mutex); - -spin_lock_irq (&pipe_crc->lock); - entries = pipe_crc->entries; - pipe_crc->entries =NULL ; - pipe_crc->head =0 ; - pipe_crc->tail =0 ; -spin_unlock_irq (&pipe_crc->lock); - -kfree (entries); - -if (IS_G4X (dev_priv)) -g4x_undo_pipe_scramble_reset (dev_priv, pipe); -else if (IS_VALLEYVIEW (dev_priv) ||IS_CHERRYVIEW (dev_priv)) -vlv_undo_pipe_scramble_reset (dev_priv, pipe); -else if ((IS_HASWELL (dev_priv) || -IS_BROADWELL (dev_priv)) && pipe ==PIPE_A ) -hsw_pipe_A_crc_wa (dev_priv, false); - } - - ret =0 ; - -out: -intel_display_power_put (dev_priv, power_domain); - -return ret; -} - -/* -* Parse pipe CRC command strings: -* command: wsp* object wsp+ name wsp+ source wsp* -* object: 'pipe' -* name: (A | B | C) -* source: (none | plane1 | plane2 | pf) -* wsp: (#0x20 | #0x9 | #0xA)+ -* -* eg.: -* "pipe A plane1" -> Start CRC computations on plane1 of pipe A -* "pipe A none" -> Stop CRC -*/ -static int display_crc_ctl_tokenize (char *buf,char *words[],int max_words) -{ -int n_words =0 ; - -while (*buf) { -char *end; - -/* skip leading white space */ - buf =skip_spaces (buf); -if (!*buf) -break ;/* end of buffer */ - -/* find end of word */ -for (end = buf; *end && !isspace (*end); end++) - ; - -if (n_words == max_words) { -DRM_DEBUG_DRIVER ("too many words, allowed <= %d\n" , - max_words); -return -EINVAL ;/* ran out of words[] before bytes */ - } - -if (*end) - *end++ ='\0' ; - words[n_words++] = buf; - buf = end; - } - -return n_words; -} - -enum intel_pipe_crc_object { -PIPE_CRC_OBJECT_PIPE , -}; - -static const char *const pipe_crc_objects[] = { -"pipe" , -}; - -static int -display_crc_ctl_parse_object (const char *buf,enum intel_pipe_crc_object *o) -{ -int i; - - i =match_string (pipe_crc_objects,ARRAY_SIZE (pipe_crc_objects), buf); -if (i <0 ) -return i; - - *o = i; -return 0 ; -} - -static int display_crc_ctl_parse_pipe (struct drm_i915_private *dev_priv, -const char *buf,enum pipe *pipe) -{ -const char name = buf[0 ]; - -if (name <'A' || name >=pipe_name (INTEL_INFO (dev_priv)->num_pipes)) -return -EINVAL ; - - *pipe = name -'A' ; - -return 0 ; -} -static int display_crc_ctl_parse_source (const char *buf,enum intel_pipe_crc_source *s) {@@ -805,81 +457,6 @@ display_crc_ctl_parse_source(const char *buf, enum intel_pipe_crc_source *s)return 0 ; } -static int display_crc_ctl_parse (struct drm_i915_private *dev_priv, -char *buf,size_t len) -{ -#define N_WORDS 3 -int n_words; -char *words[N_WORDS ]; -enum pipe pipe; -enum intel_pipe_crc_object object; -enum intel_pipe_crc_source source; - - n_words =display_crc_ctl_tokenize (buf, words,N_WORDS ); -if (n_words !=N_WORDS ) { -DRM_DEBUG_DRIVER ("tokenize failed, a command is %d words\n" , -N_WORDS ); -return -EINVAL ; - } - -if (display_crc_ctl_parse_object (words[0 ], &object) <0 ) { -DRM_DEBUG_DRIVER ("unknown object %s\n" , words[0 ]); -return -EINVAL ; - } - -if (display_crc_ctl_parse_pipe (dev_priv, words[1 ], &pipe) <0 ) { -DRM_DEBUG_DRIVER ("unknown pipe %s\n" , words[1 ]); -return -EINVAL ; - } - -if (display_crc_ctl_parse_source (words[2 ], &source) <0 ) { -DRM_DEBUG_DRIVER ("unknown source %s\n" , words[2 ]); -return -EINVAL ; - } - -return pipe_crc_set_source (dev_priv, pipe, source); -} - -static ssize_t display_crc_ctl_write (struct file *file,const char __user *ubuf, -size_t len,loff_t *offp) -{ -struct seq_file *m = file->private_data; -struct drm_i915_private *dev_priv = m->private; -char *tmpbuf; -int ret; - -if (len ==0 ) -return 0 ; - -if (len >PAGE_SIZE -1 ) { -DRM_DEBUG_DRIVER ("expected <%lu bytes into pipe crc control\n" , -PAGE_SIZE ); -return -E2BIG ; - } - - tmpbuf =memdup_user_nul (ubuf, len); -if (IS_ERR (tmpbuf)) -return PTR_ERR (tmpbuf); - - ret =display_crc_ctl_parse (dev_priv, tmpbuf, len); - -kfree (tmpbuf); -if (ret <0 ) -return ret; - - *offp += len; -return len; -} - -const struct file_operations i915_display_crc_ctl_fops = { - .owner =THIS_MODULE , - .open = display_crc_ctl_open, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, - .write = display_crc_ctl_write -}; -void intel_display_crc_init (struct drm_i915_private *dev_priv) {enum pipe pipe;@@ -887,30 +464,8 @@ void intel_display_crc_init(struct drm_i915_private *dev_priv)for_each_pipe (dev_priv, pipe) {struct intel_pipe_crc *pipe_crc = &dev_priv->pipe_crc[pipe]; - pipe_crc->opened = false;spin_lock_init (&pipe_crc->lock); -init_waitqueue_head (&pipe_crc->wq); - } -} - -int intel_pipe_crc_create (struct drm_minor *minor) -{ -struct drm_i915_private *dev_priv =to_i915 (minor->dev); -struct dentry *ent; -int i; - -for (i =0 ; i <ARRAY_SIZE (i915_pipe_crc_data); i++) { -struct pipe_crc_info *info = &i915_pipe_crc_data[i]; - - info->dev_priv = dev_priv; - ent =debugfs_create_file (info->name,S_IRUGO , - minor->debugfs_root, info, - &i915_pipe_crc_fops); -if (!ent) -return -ENOMEM ; } - -return 0 ; } int intel_crtc_set_crc_source(struct drm_crtc *crtc, const char *source_name,
Signature · 5 lines
Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.IGT: failure for series starting with [1/2] drm/i915: Remove support for legacy debugfs crc interface
In reply to Maarten Lankhorst== Series Details ==
== Series Details ==
Series: series starting with [1/2] drm/i915: Remove support for legacy debugfs crc interface
URL : https://patchwork.freedesktop.org/series/45553/
State : failure
== Summary ==
= CI Bug Log - changes from CI_DRM_4396_full -> Patchwork_9459_full =
== Summary - FAILURE ==
Serious unknown changes coming with Patchwork_9459_full absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_9459_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
== Possible new issues ==
Here are the unknown changes that may have been introduced in Patchwork_9459_full:
=== IGT changes ===
==== Possible regressions ====
igt@kms_universal_plane@cursor-fb-leak-pipe-b:
shard-apl: PASS -> FAIL
==== Warnings ====
igt@gem_exec_schedule@deep-bsd2:
shard-kbl: SKIP -> PASS
igt@gem_exec_schedule@deep-vebox:
shard-kbl: PASS -> SKIP +1== Known issues ==
Here are the changes found in Patchwork_9459_full that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@drv_selftest@live_hangcheck:
shard-apl: PASS -> DMESG-FAIL (fdo#106560, fdo#106947)
igt@drv_selftest@mock_scatterlist:
shard-kbl: NOTRUN -> DMESG-WARN (fdo#103667)
igt@gem_exec_schedule@pi-ringfull-bsd1:
shard-kbl: NOTRUN -> FAIL (fdo#103158)
igt@gem_exec_schedule@pi-ringfull-vebox:
shard-glk: NOTRUN -> FAIL (fdo#103158)
igt@kms_flip@2x-plain-flip-fb-recreate:
{shard-glk9}: NOTRUN -> FAIL (fdo#100368)
igt@kms_flip_tiling@flip-x-tiled:
shard-glk: PASS -> FAIL (fdo#103822, fdo#104724)
igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-indfb-draw-render:
shard-snb: PASS -> FAIL (fdo#103167, fdo#104724)
igt@kms_setmode@basic:
shard-kbl: PASS -> FAIL (fdo#99912)
igt@testdisplay:
shard-glk: NOTRUN -> INCOMPLETE (fdo#103359, k.org#198133)
==== Possible fixes ====
igt@drv_selftest@live_gtt:
shard-glk: FAIL (fdo#105347) -> PASS
igt@kms_flip@plain-flip-fb-recreate:
shard-glk: FAIL (fdo#100368) -> PASS
igt@kms_flip_tiling@flip-y-tiled:
shard-glk: FAIL (fdo#103822, fdo#104724) -> PASS {name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#103158 https://bugs.freedesktop.org/show_bug.cgi?id=103158
fdo#103167 https://bugs.freedesktop.org/show_bug.cgi?id=103167
fdo#103359 https://bugs.freedesktop.org/show_bug.cgi?id=103359
fdo#103667 https://bugs.freedesktop.org/show_bug.cgi?id=103667
fdo#103822 https://bugs.freedesktop.org/show_bug.cgi?id=103822
fdo#104724 https://bugs.freedesktop.org/show_bug.cgi?id=104724
fdo#105347 https://bugs.freedesktop.org/show_bug.cgi?id=105347
fdo#106560 https://bugs.freedesktop.org/show_bug.cgi?id=106560
fdo#106947 https://bugs.freedesktop.org/show_bug.cgi?id=106947
fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912
k.org#198133 https://bugzilla.kernel.org/show_bug.cgi?id=198133
== Participating hosts (6 -> 6) ==
No changes in participating hosts
== Build changes ==
* Linux: CI_DRM_4396 -> Patchwork_9459
CI_DRM_4396: dd5f49f9686f412baa426502d417ac74a37fc77e @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4530: 0e98bf69f146eb72fe3a7c3b19a049b5786f0ca3 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9459: 107c66964ccb63a1faf7cde7381cd533ddd8b237 @ 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_9459/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: ✗ Fi.CI.IGT: failure for series starting with [1/2] drm/i915: Remove support for legacy debugfs crc interface
Op 28-06-18 om 12:41 schreef Patchwork:
Quoted 23 lines
== Series Details ==
Series: series starting with [1/2] drm/i915: Remove support for legacy debugfs crc interface
URL : https://patchwork.freedesktop.org/series/45553/
State : failure== Summary ==
= CI Bug Log - changes from
CI_DRM_4396_full->Patchwork_9459_full=== Summary - FAILURE ==
Serious unknown changes coming with
Patchwork_9459_fullabsolutely need to be verified manually.If you think the reported changes have nothing to do with the changes introduced in
Patchwork_9459_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.== Possible new issues ==
Quoted 8 lines
Here are the unknown changes that may have been introduced in
Patchwork_9459_full:=== IGT changes ===
==== Possible regressions ==== igt@kms_universal_plane@cursor-fb-leak-pipe-b: shard-apl: PASS -> FAIL
Likely the following culprit:
commit 8d52e447807b350b98ffb4e64bc2fcc1f181c5be
Author: Chris Wilson <[email protected]> Date: Sat Jun 23 11:39:51 2018 +0100
drm/i915: Defer modeset cleanup to a secondary task
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx