Skip to contentSkip to conversation

drm/i915: Remove support for legacy debugfs crc interface

PATCH New Maarten Lankhorst 2 participants 3 messages Mar 8, 2018 – Mar 9, 2018

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/i915: Remove support for legacy debugfs crc interface

This interface is deprecated, and has been replaced by the upstream drm crc interface.

Cc Tomi Sarvela <[email protected]>
Cc Petri Latvala <[email protected]>
Cc Jani Nikula <[email protected]>
Cc Ville Syrjälä <[email protected]>
---
 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 | 446 ----------------------------------
 5 files changed, 24 insertions(+), 521 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +1 -6
index 89f7ff2c652e..8f0570def4c8 100644
@@ -4771,7 +4771,6 @@ static const struct i915_debugfs_files {
 	{"i915_gpu_info", &i915_gpu_info_fops},
 #endif
 	{"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},
@@ -4789,7 +4788,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),
@@ -4797,10 +4796,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
index 6e740f6fe33f..0a51eae8ce27 100644
@@ -1525,20 +1525,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	128
 struct 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
index fce5d3072d97..85dc09d3b19c 100644
@@ -2134,7 +2134,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);
@@ -2150,5 +2149,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 -446

478 lines not on this page · raw message

Signature · 6 lines
2.16.2

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

✗ Fi.CI.BAT: warning for drm/i915: Remove support for legacy debugfs crc interface (rev2)

== Series Details ==

== Series Details ==

Series: drm/i915: Remove support for legacy debugfs crc interface (rev2)
URL : https://patchwork.freedesktop.org/series/33053/
State : warning

== Summary ==

Series 33053v2 drm/i915: Remove support for legacy debugfs crc interface
https://patchwork.freedesktop.org/api/1.0/series/33053/revisions/2/mbox/

---- Possible new issues:

Test kms_pipe_crc_basic:

        Subgroup bad-nb-words-1:
                pass       -> SKIP       (fi-bdw-5557u)
                pass       -> SKIP       (fi-bdw-gvtdvm)
                pass       -> SKIP       (fi-blb-e6850)
                pass       -> SKIP       (fi-bsw-n3050)
                pass       -> SKIP       (fi-bwr-2160)
                pass       -> SKIP       (fi-bxt-dsi)
                pass       -> SKIP       (fi-bxt-j4205)
                pass       -> SKIP       (fi-byt-j1900)
                pass       -> SKIP       (fi-byt-n2820)
                pass       -> SKIP       (fi-cfl-8700k)
                pass       -> SKIP       (fi-cfl-s2)
                pass       -> SKIP       (fi-cnl-y3)
                pass       -> SKIP       (fi-elk-e7500)
                pass       -> SKIP       (fi-gdg-551)
                pass       -> SKIP       (fi-glk-1)
                pass       -> SKIP       (fi-hsw-4770)
                pass       -> SKIP       (fi-ilk-650)
                pass       -> SKIP       (fi-ivb-3520m)
                pass       -> SKIP       (fi-ivb-3770)
                pass       -> SKIP       (fi-kbl-7500u)
                pass       -> SKIP       (fi-kbl-7567u)
                pass       -> SKIP       (fi-kbl-r)
                pass       -> SKIP       (fi-pnv-d510)
                pass       -> SKIP       (fi-skl-6260u)
                pass       -> SKIP       (fi-skl-6600u)
                pass       -> SKIP       (fi-skl-6700hq)
                pass       -> SKIP       (fi-skl-6700k2)
                pass       -> SKIP       (fi-skl-6770hq)
                pass       -> SKIP       (fi-skl-guc)
                pass       -> SKIP       (fi-snb-2600)
        Subgroup bad-nb-words-3:
                pass       -> SKIP       (fi-bdw-5557u)
                pass       -> SKIP       (fi-bdw-gvtdvm)
                pass       -> SKIP       (fi-blb-e6850)
                pass       -> SKIP       (fi-bsw-n3050)
                pass       -> SKIP       (fi-bwr-2160)
                pass       -> SKIP       (fi-bxt-dsi)
                pass       -> SKIP       (fi-bxt-j4205)
                pass       -> SKIP       (fi-byt-j1900)
                pass       -> SKIP       (fi-byt-n2820)
                pass       -> SKIP       (fi-cfl-8700k)
                pass       -> SKIP       (fi-cfl-s2)
                pass       -> SKIP       (fi-cnl-y3)
                pass       -> SKIP       (fi-elk-e7500)
                pass       -> SKIP       (fi-gdg-551)
                pass       -> SKIP       (fi-glk-1)
                pass       -> SKIP       (fi-hsw-4770)
                pass       -> SKIP       (fi-ilk-650)
                pass       -> SKIP       (fi-ivb-3520m)
                pass       -> SKIP       (fi-ivb-3770)
                pass       -> SKIP       (fi-kbl-7500u)
                pass       -> SKIP       (fi-kbl-7567u)
                pass       -> SKIP       (fi-kbl-r)
                pass       -> SKIP       (fi-pnv-d510)
                pass       -> SKIP       (fi-skl-6260u)
                pass       -> SKIP       (fi-skl-6600u)
                pass       -> SKIP       (fi-skl-6700hq)
                pass       -> SKIP       (fi-skl-6700k2)
                pass       -> SKIP       (fi-skl-6770hq)
                pass       -> SKIP       (fi-skl-guc)
                pass       -> SKIP       (fi-snb-2600)
        Subgroup bad-pipe:
                pass       -> SKIP       (fi-bdw-5557u)
                pass       -> SKIP       (fi-bdw-gvtdvm)
                pass       -> SKIP       (fi-blb-e6850)
                pass       -> SKIP       (fi-bsw-n3050)
                pass       -> SKIP       (fi-bwr-2160)
                pass       -> SKIP       (fi-bxt-dsi)
                pass       -> SKIP       (fi-bxt-j4205)
                pass       -> SKIP       (fi-byt-j1900)
                pass       -> SKIP       (fi-byt-n2820)
                pass       -> SKIP       (fi-cfl-8700k)
                pass       -> SKIP       (fi-cfl-s2)
                pass       -> SKIP       (fi-cnl-y3)
                pass       -> SKIP       (fi-elk-e7500)
                pass       -> SKIP       (fi-gdg-551)
                pass       -> SKIP       (fi-glk-1)
                pass       -> SKIP       (fi-hsw-4770)
                pass       -> SKIP       (fi-ilk-650)
                pass       -> SKIP       (fi-ivb-3520m)
                pass       -> SKIP       (fi-ivb-3770)
                pass       -> SKIP       (fi-kbl-7500u)
                pass       -> SKIP       (fi-kbl-7567u)
                pass       -> SKIP       (fi-kbl-r)
                pass       -> SKIP       (fi-pnv-d510)
                pass       -> SKIP       (fi-skl-6260u)
                pass       -> SKIP       (fi-skl-6600u)
                pass       -> SKIP       (fi-skl-6700hq)
                pass       -> SKIP       (fi-skl-6700k2)
                pass       -> SKIP       (fi-skl-6770hq)
                pass       -> SKIP       (fi-skl-guc)
                pass       -> SKIP       (fi-snb-2600)

WARNING: Long output truncated

1a1b6b34c3f26fb47b2cf9d08520e9d79fe1ef52 drm-tip: 2018y-03m-08d-18h-11m-37s UTC integration manifest 110d66f6f61f drm/i915: Remove support for legacy debugfs crc interface

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8276/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#2 lore raw

✗ Fi.CI.IGT: failure for drm/i915: Remove support for legacy debugfs crc interface (rev2)

In reply to Maarten Lankhorst
== Series Details ==

== Series Details ==

Series: drm/i915: Remove support for legacy debugfs crc interface (rev2)
URL : https://patchwork.freedesktop.org/series/33053/
State : failure

== Summary ==

---- Possible new issues:

Test kms_pipe_crc_basic:

        Subgroup bad-nb-words-1:
                pass       -> SKIP       (shard-apl)
                pass       -> SKIP       (shard-hsw)
                pass       -> SKIP       (shard-snb)
        Subgroup bad-nb-words-3:
                pass       -> SKIP       (shard-apl)
                pass       -> SKIP       (shard-hsw)
                pass       -> SKIP       (shard-snb)
        Subgroup bad-pipe:
                pass       -> SKIP       (shard-apl)
                pass       -> SKIP       (shard-hsw)
                pass       -> SKIP       (shard-snb)
Test perf_pmu:
        Subgroup multi-client-vcs0:
                pass       -> FAIL       (shard-snb)

---- Known issues:

Test drv_selftest:

        Subgroup live_gtt:
                pass       -> INCOMPLETE (shard-apl) fdo#103927
Test kms_cursor_legacy:
        Subgroup flip-vs-cursor-toggle:
                pass       -> FAIL       (shard-hsw) fdo#102670
Test kms_flip:
        Subgroup plain-flip-fb-recreate-interruptible:
                fail       -> PASS       (shard-hsw) fdo#100368
Test perf_pmu:
        Subgroup busy-start-vcs0:
                fail       -> PASS       (shard-snb) fdo#105106

fdo#103927 https://bugs.freedesktop.org/show_bug.cgi?id=103927
fdo#102670 https://bugs.freedesktop.org/show_bug.cgi?id=102670
fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#105106 https://bugs.freedesktop.org/show_bug.cgi?id=105106

shard-apl        total:3445 pass:1798 dwarn:1   dfail:0   fail:9   skip:1635 time:11698s
shard-hsw        total:3467 pass:1768 dwarn:1   dfail:0   fail:3   skip:1694 time:11638s
shard-snb        total:3467 pass:1359 dwarn:1   dfail:0   fail:3   skip:2104 time:6893s

Blacklisted hosts:
shard-kbl total:3381 pass:1895 dwarn:1 dfail:0 fail:9 skip:1475 time:9040s

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8276/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx