lib/debugfs: Nuke enum intel_pipe_crc_source
PATCH 1/1 lib/debugfs: Nuke enum intel_pipe_crc_source
From: Ville Syrjälä <[email protected]>
No one is using anything but the "auto" crc source, so the enum listing other options is quite pointless. Let's switch to just using the string instead of the enum. That way any hypothetical test that wants to use a more specific crc source can just pass in the proper string.
--- lib/igt_debugfs.c | 31 +++++++------------------------ lib/igt_debugfs.h | 38 +++----------------------------------- 2 files changed, 10 insertions(+), 59 deletions(-)
lib/igt_debugfs.c +7 -24
@@ -497,27 +497,9 @@ struct _igt_pipe_crc {int flags;enum pipe pipe; -enum intel_pipe_crc_source source; +char *source; }; -static const char *pipe_crc_sources[] = { -"none" , -"plane1" , -"plane2" , -"pf" , -"pipe" , -"TV" , -"DP-B" , -"DP-C" , -"DP-D" , -"auto" -}; - -static const char *pipe_crc_source_name (enum intel_pipe_crc_source source) -{ -return pipe_crc_sources[source]; -} -/** * igt_require_pipe_crc: *
@@ -660,7 +642,7 @@ void igt_require_hpd_storm_ctl(int drm_fd) }static igt_pipe_crc_t * -pipe_crc_new (int fd,enum pipe pipe,enum intel_pipe_crc_source source,int flags) +pipe_crc_new (int fd,enum pipe pipe,const char *source,int flags) {igt_pipe_crc_t *pipe_crc;char buf[128 ];
@@ -679,7 +661,7 @@ pipe_crc_new(int fd, enum pipe pipe, enum intel_pipe_crc_source source, int flag pipe_crc->fd = fd; pipe_crc->dir = debugfs; pipe_crc->pipe = pipe; - pipe_crc->source = source; + pipe_crc->source =strdup (source); pipe_crc->flags = flags;return pipe_crc;
@@ -698,7 +680,7 @@ pipe_crc_new(int fd, enum pipe pipe, enum intel_pipe_crc_source source, int flag* least INTEL_PIPE_CRC_SOURCE_AUTO everywhere. */ igt_pipe_crc_t * -igt_pipe_crc_new (int fd,enum pipe pipe,enum intel_pipe_crc_source source) +igt_pipe_crc_new (int fd,enum pipe pipe,const char *source) {return pipe_crc_new (fd, pipe, source,O_RDONLY ); }
@@ -716,7 +698,7 @@ igt_pipe_crc_new(int fd, enum pipe pipe, enum intel_pipe_crc_source source)* least INTEL_PIPE_CRC_SOURCE_AUTO everywhere. */ igt_pipe_crc_t * -igt_pipe_crc_new_nonblock (int fd,enum pipe pipe,enum intel_pipe_crc_source source) +igt_pipe_crc_new_nonblock (int fd,enum pipe pipe,const char *source) {return pipe_crc_new (fd, pipe, source,O_RDONLY |O_NONBLOCK ); }
@@ -735,6 +717,7 @@ void igt_pipe_crc_free(igt_pipe_crc_t *pipe_crc)close (pipe_crc->ctl_fd);close (pipe_crc->crc_fd);close (pipe_crc->dir); +free (pipe_crc->source);free (pipe_crc); }
@@ -801,7 +784,7 @@ static void read_one_crc(igt_pipe_crc_t *pipe_crc, igt_crc_t *out)*/ void igt_pipe_crc_start (igt_pipe_crc_t *pipe_crc) { -const char *src =pipe_crc_source_name (pipe_crc->source); +const char *src = pipe_crc->source;struct pollfd pfd;char buf[32 ];
lib/igt_debugfs.h +3 -35
@@ -82,39 +82,7 @@ typedef struct {uint32_t crc[DRM_MAX_CRC_NR ]; } igt_crc_t; -/** -* intel_pipe_crc_source: -* @INTEL_PIPE_CRC_SOURCE_NONE: No source -* @INTEL_PIPE_CRC_SOURCE_PLANE1: Plane 1 -* @INTEL_PIPE_CRC_SOURCE_PLANE2: Plane 2 -* @INTEL_PIPE_CRC_SOURCE_PF: Panel Filter -* @INTEL_PIPE_CRC_SOURCE_PIPE: Pipe -* @INTEL_PIPE_CRC_SOURCE_TV: TV -* @INTEL_PIPE_CRC_SOURCE_DP_B: DisplayPort B -* @INTEL_PIPE_CRC_SOURCE_DP_C: DisplayPort C -* @INTEL_PIPE_CRC_SOURCE_DP_D: DisplayPort D -* @INTEL_PIPE_CRC_SOURCE_AUTO: Automatic source selection -* @INTEL_PIPE_CRC_SOURCE_MAX: Number of available sources -* -* Enumeration of all supported pipe CRC sources. Not all platforms and all -* outputs support all of them. Generic tests should just use -* INTEL_PIPE_CRC_SOURCE_AUTO. It should always map to an end-of-pipe CRC -* suitable for checking planes, cursor, color correction and any other -* output-agnostic features. -*/ -enum intel_pipe_crc_source { -INTEL_PIPE_CRC_SOURCE_NONE , -INTEL_PIPE_CRC_SOURCE_PLANE1 , -INTEL_PIPE_CRC_SOURCE_PLANE2 , -INTEL_PIPE_CRC_SOURCE_PF , -INTEL_PIPE_CRC_SOURCE_PIPE , -INTEL_PIPE_CRC_SOURCE_TV , -INTEL_PIPE_CRC_SOURCE_DP_B , -INTEL_PIPE_CRC_SOURCE_DP_C , -INTEL_PIPE_CRC_SOURCE_DP_D , -INTEL_PIPE_CRC_SOURCE_AUTO , -INTEL_PIPE_CRC_SOURCE_MAX , -}; +#define INTEL_PIPE_CRC_SOURCE_AUTO "auto"void igt_assert_crc_equal (const igt_crc_t *a,const igt_crc_t *b);bool igt_check_crc_equal (const igt_crc_t *a,const igt_crc_t *b);
@@ -123,9 +91,9 @@ char *igt_crc_to_string(igt_crc_t *crc);void igt_require_pipe_crc (int fd);igt_pipe_crc_t * -igt_pipe_crc_new (int fd,enum pipe pipe,enum intel_pipe_crc_source source); +igt_pipe_crc_new (int fd,enum pipe pipe,const char *source);igt_pipe_crc_t * -igt_pipe_crc_new_nonblock (int fd,enum pipe pipe,enum intel_pipe_crc_source source); +igt_pipe_crc_new_nonblock (int fd,enum pipe pipe,const char *source);void igt_pipe_crc_free (igt_pipe_crc_t *pipe_crc);void igt_pipe_crc_start (igt_pipe_crc_t *pipe_crc);void igt_pipe_crc_stop (igt_pipe_crc_t *pipe_crc);
Signature · 6 lines
2.19.2 _______________________________________________ igt-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/igt-dev
Patchwork
CI[igt-dev] ✓ Fi.CI.BAT: success for lib/debugfs: Nuke enum intel_pipe_crc_source
== Series Details ==
== Series Details ==
Series: lib/debugfs: Nuke enum intel_pipe_crc_source
URL : https://patchwork.freedesktop.org/series/56731/
State : success
== Summary ==
CI Bug Log - changes from IGT_4831 -> IGTPW_2420
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/56731/revisions/1/mbox/
Known issues
------------
Here are the changes found in IGTPW_2420 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_suspend@basic-s4-devices:
- fi-blb-e6850: PASS -> INCOMPLETE [fdo#107718]
* igt@pm_rpm@basic-rte:
- fi-bsw-kefka: PASS -> FAIL [fdo#108800]
* igt@pm_rpm@module-reload:
- fi-skl-6770hq: PASS -> FAIL [fdo#108511]
#### Possible fixes ####
* igt@i915_selftest@live_execlists:
- fi-apl-guc: INCOMPLETE [fdo#103927] -> PASS
- {fi-icl-y}: INCOMPLETE [fdo#109567] -> PASS
* igt@kms_frontbuffer_tracking@basic:
- fi-byt-clapper: FAIL [fdo#103167] -> PASS
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
[fdo#107718]: https://bugs.freedesktop.org/show_bug.cgi?id=107718
[fdo#108511]: https://bugs.freedesktop.org/show_bug.cgi?id=108511
[fdo#108569]: https://bugs.freedesktop.org/show_bug.cgi?id=108569
[fdo#108800]: https://bugs.freedesktop.org/show_bug.cgi?id=108800
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109567]: https://bugs.freedesktop.org/show_bug.cgi?id=109567
Participating hosts (51 -> 44)
------------------------------
Missing (7): fi-kbl-soraka fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-ctg-p8600 fi-bdw-samus
Build changes
-------------
* IGT: IGT_4831 -> IGTPW_2420
CI_DRM_5608: a6301f3b868a688c97ae63d9ad4cb69ff62596bb @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_2420: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_2420/
IGT_4831: 616842ef493ead76ac6c75b2a93337439724655f @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_2420/
_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev
Patchwork
CI[igt-dev] ✓ Fi.CI.IGT: success for lib/debugfs: Nuke enum intel_pipe_crc_source
In reply to Ville Syrjala via igt-dev== Series Details ==
== Series Details ==
Series: lib/debugfs: Nuke enum intel_pipe_crc_source
URL : https://patchwork.freedesktop.org/series/56731/
State : success
== Summary ==
CI Bug Log - changes from IGT_4831_full -> IGTPW_2420_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/56731/revisions/1/mbox/
Known issues
------------
Here are the changes found in IGTPW_2420_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@i915_suspend@shrink:
- shard-glk: NOTRUN -> DMESG-WARN [fdo#109244]
* igt@kms_busy@extended-modeset-hang-newfb-render-c:
- shard-glk: NOTRUN -> DMESG-WARN [fdo#107956]
* igt@kms_busy@extended-modeset-hang-newfb-with-reset-render-b:
- shard-snb: NOTRUN -> DMESG-WARN [fdo#107956]
* igt@kms_busy@extended-pageflip-hang-newfb-render-b:
- shard-apl: PASS -> DMESG-WARN [fdo#107956]
* igt@kms_busy@extended-pageflip-hang-newfb-render-c:
- shard-apl: NOTRUN -> DMESG-WARN [fdo#107956] +1
* igt@kms_ccs@pipe-a-crc-sprite-planes-basic:
- shard-glk: PASS -> FAIL [fdo#108145]
* igt@kms_color@pipe-c-legacy-gamma:
- shard-apl: PASS -> FAIL [fdo#104782]
* igt@kms_cursor_crc@cursor-128x42-sliding:
- shard-kbl: PASS -> FAIL [fdo#103232]
- shard-apl: PASS -> FAIL [fdo#103232] +1
* igt@kms_cursor_crc@cursor-64x21-random:
- shard-glk: NOTRUN -> FAIL [fdo#103232]
* igt@kms_cursor_crc@cursor-alpha-opaque:
- shard-glk: PASS -> FAIL [fdo#109350]
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-mmap-gtt:
- shard-apl: PASS -> FAIL [fdo#103167] +1
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-move:
- shard-glk: PASS -> FAIL [fdo#103167] +9
* igt@kms_frontbuffer_tracking@fbc-stridechange:
- shard-hsw: NOTRUN -> FAIL [fdo#105682]
* igt@kms_plane@pixel-format-pipe-a-planes-source-clamping:
- shard-glk: PASS -> FAIL [fdo#108948]
* igt@kms_plane@plane-panning-bottom-right-suspend-pipe-c-planes:
- shard-kbl: PASS -> INCOMPLETE [fdo#103665]
* igt@kms_plane@plane-position-covered-pipe-c-planes:
- shard-apl: PASS -> FAIL [fdo#103166] +4
* igt@kms_plane_alpha_blend@pipe-c-constant-alpha-max:
- shard-apl: NOTRUN -> FAIL [fdo#108145]
* igt@kms_plane_multiple@atomic-pipe-b-tiling-x:
- shard-kbl: PASS -> FAIL [fdo#103166] +2
* igt@kms_plane_multiple@atomic-pipe-b-tiling-y:
- shard-glk: PASS -> FAIL [fdo#103166] +1
* igt@kms_rotation_crc@multiplane-rotation-cropping-bottom:
- shard-kbl: PASS -> DMESG-FAIL [fdo#105763]
* igt@kms_setmode@basic:
- shard-hsw: NOTRUN -> FAIL [fdo#99912]
- shard-kbl: PASS -> FAIL [fdo#99912]
* igt@kms_vblank@pipe-c-ts-continuation-dpms-suspend:
- shard-apl: PASS -> FAIL [fdo#104894]
#### Possible fixes ####
* igt@gem_userptr_blits@sync-unmap-cycles:
- shard-snb: INCOMPLETE [fdo#105411] / [fdo#109386] -> PASS
* igt@kms_atomic_transition@plane-toggle-modeset-transition:
- shard-apl: INCOMPLETE [fdo#103927] -> PASS +1
* igt@kms_ccs@pipe-b-crc-sprite-planes-basic:
- shard-glk: FAIL [fdo#108145] -> PASS +1
* igt@kms_color@pipe-b-degamma:
- shard-apl: FAIL [fdo#104782] -> PASS
* igt@kms_cursor_crc@cursor-128x128-suspend:
- shard-apl: FAIL [fdo#103191] / [fdo#103232] -> PASS +1
- shard-kbl: INCOMPLETE [fdo#103665] -> PASS
* igt@kms_cursor_crc@cursor-256x85-onscreen:
- shard-apl: FAIL [fdo#103232] -> PASS +6
* igt@kms_cursor_crc@cursor-64x64-sliding:
- shard-kbl: FAIL [fdo#103232] -> PASS
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-pwrite:
- shard-apl: FAIL [fdo#103167] -> PASS
* igt@kms_frontbuffer_tracking@fbc-2p-primscrn-spr-indfb-onoff:
- shard-glk: FAIL [fdo#103167] -> PASS +3
* igt@kms_plane@pixel-format-pipe-a-planes:
- shard-kbl: FAIL [fdo#103166] -> PASS
* igt@kms_plane_multiple@atomic-pipe-b-tiling-none:
- shard-glk: FAIL [fdo#103166] -> PASS +2
- shard-apl: FAIL [fdo#103166] -> PASS +3
* igt@kms_rotation_crc@multiplane-rotation:
- shard-kbl: FAIL [fdo#109016] -> PASS
* igt@kms_setmode@basic:
- shard-apl: FAIL [fdo#99912] -> PASS
* igt@kms_vblank@pipe-b-query-forked-busy-hang:
- shard-snb: {SKIP} [fdo#109271] -> PASS +5
* igt@kms_vblank@pipe-c-ts-continuation-modeset-rpm:
- shard-kbl: FAIL [fdo#104894] -> PASS
* igt@kms_vblank@pipe-c-ts-continuation-suspend:
- shard-apl: FAIL [fdo#104894] -> PASS +5
* igt@tools_test@tools_test:
- shard-glk: {SKIP} [fdo#109271] -> PASS
#### Warnings ####
* igt@i915_suspend@shrink:
- shard-apl: INCOMPLETE [fdo#103927] / [fdo#106886] -> DMESG-WARN [fdo#107886] / [fdo#109244]
- shard-kbl: DMESG-WARN [fdo#109244] -> INCOMPLETE [fdo#103665] / [fdo#106886]
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#103166]: https://bugs.freedesktop.org/show_bug.cgi?id=103166
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#103191]: https://bugs.freedesktop.org/show_bug.cgi?id=103191
[fdo#103232]: https://bugs.freedesktop.org/show_bug.cgi?id=103232
[fdo#103665]: https://bugs.freedesktop.org/show_bug.cgi?id=103665
[fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
[fdo#104782]: https://bugs.freedesktop.org/show_bug.cgi?id=104782
[fdo#104894]: https://bugs.freedesktop.org/show_bug.cgi?id=104894
[fdo#105411]: https://bugs.freedesktop.org/show_bug.cgi?id=105411
[fdo#105682]: https://bugs.freedesktop.org/show_bug.cgi?id=105682
[fdo#105763]: https://bugs.freedesktop.org/show_bug.cgi?id=105763
[fdo#106886]: https://bugs.freedesktop.org/show_bug.cgi?id=106886
[fdo#107886]: https://bugs.freedesktop.org/show_bug.cgi?id=107886
[fdo#107956]: https://bugs.freedesktop.org/show_bug.cgi?id=107956
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#108948]: https://bugs.freedesktop.org/show_bug.cgi?id=108948
[fdo#109016]: https://bugs.freedesktop.org/show_bug.cgi?id=109016
[fdo#109244]: https://bugs.freedesktop.org/show_bug.cgi?id=109244
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
[fdo#109350]: https://bugs.freedesktop.org/show_bug.cgi?id=109350
[fdo#109386]: https://bugs.freedesktop.org/show_bug.cgi?id=109386
[fdo#99912]: https://bugs.freedesktop.org/show_bug.cgi?id=99912
Participating hosts (7 -> 5)
------------------------------
Missing (2): shard-skl shard-iclb
Build changes
-------------
* IGT: IGT_4831 -> IGTPW_2420
CI_DRM_5608: a6301f3b868a688c97ae63d9ad4cb69ff62596bb @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_2420: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_2420/
IGT_4831: 616842ef493ead76ac6c75b2a93337439724655f @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_2420/
_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev
Quoting Ville Syrjala via igt-dev (2019-02-15 13:26:38)
lib/igt_debugfs.c pipe_crc_new(int fd, enum pipe pipe, enum intel_pipe_crc_source source, int flag · line 664
Quoted 12 lines
static
igt_pipe_crc_t*lib/igt_debugfs.c +2
-2-pipe_crc_new(int fd, enum pipe pipe, enum intel_pipe_crc_source source, int flags) +pipe_crc_new(int fd, enum pipe pipe, const char *source, int flags) { igt_pipe_crc_t *pipe_crc;char buf[128 ];@@ -679,7 +661,7 @@ pipe_crc_new(int fd, enum pipe pipe, enum intel_pipe_crc_source source, int flag pipe_crc->fd = fd; pipe_crc->dir = debugfs; pipe_crc->pipe = pipe; - pipe_crc->source = source; + pipe_crc->source =strdup (source);
xstrdup()igt_assert(pipe_crc->source);
Probably merits an igt_assert(source) on entry as well.
Quoted 4 lines
lib/igt_debugfs.h +0
-4-enum intel_pipe_crc_source { -INTEL_PIPE_CRC_SOURCE_NONE , -INTEL_PIPE_CRC_SOURCE_PLANE1 , -INTEL_PIPE_CRC_SOURCE_PLANE2 ,
lib/igt_debugfs.h typedef struct { · line 85
Quoted 10 lines
lib/igt_debugfs.h +1
-9-INTEL_PIPE_CRC_SOURCE_PF , -INTEL_PIPE_CRC_SOURCE_PIPE , -INTEL_PIPE_CRC_SOURCE_TV , -INTEL_PIPE_CRC_SOURCE_DP_B , -INTEL_PIPE_CRC_SOURCE_DP_C , -INTEL_PIPE_CRC_SOURCE_DP_D , -INTEL_PIPE_CRC_SOURCE_AUTO , - INTEL_PIPE_CRC_SOURCE_MAX, -}; +#define INTEL_PIPE_CRC_SOURCE_AUTO "auto"
Ah that's the magic behind the patch being so tiny.
-Chris
_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev
PATCH v2 1/1 lib/debugfs: Nuke enum intel_pipe_crc_source
In reply to Ville Syrjala via igt-devFrom: Ville Syrjälä <[email protected]>
No one is using anything but the "auto" crc source, so the enum listing other options is quite pointless. Let's switch to just using the string instead of the enum. That way any hypothetical test that wants to use a more specific crc source can just pass in the proper string.
v2: Assert the string isn't NULL (Chris)
--- lib/igt_debugfs.c | 34 ++++++++++------------------------ lib/igt_debugfs.h | 38 +++----------------------------------- 2 files changed, 13 insertions(+), 59 deletions(-)
lib/igt_debugfs.c +10 -24
@@ -497,27 +497,9 @@ struct _igt_pipe_crc {int flags;enum pipe pipe; -enum intel_pipe_crc_source source; +char *source; }; -static const char *pipe_crc_sources[] = { -"none" , -"plane1" , -"plane2" , -"pf" , -"pipe" , -"TV" , -"DP-B" , -"DP-C" , -"DP-D" , -"auto" -}; - -static const char *pipe_crc_source_name (enum intel_pipe_crc_source source) -{ -return pipe_crc_sources[source]; -} -/** * igt_require_pipe_crc: *
@@ -660,12 +642,14 @@ void igt_require_hpd_storm_ctl(int drm_fd) }static igt_pipe_crc_t * -pipe_crc_new (int fd,enum pipe pipe,enum intel_pipe_crc_source source,int flags) +pipe_crc_new (int fd,enum pipe pipe,const char *source,int flags) {igt_pipe_crc_t *pipe_crc;char buf[128 ];int debugfs; +igt_assert (source); + debugfs =igt_debugfs_dir (fd);igt_assert (debugfs !=-1 );
@@ -679,7 +663,8 @@ pipe_crc_new(int fd, enum pipe pipe, enum intel_pipe_crc_source source, int flag pipe_crc->fd = fd; pipe_crc->dir = debugfs; pipe_crc->pipe = pipe; - pipe_crc->source = source; + pipe_crc->source =strdup (source); +igt_assert (pipe_crc->source); pipe_crc->flags = flags;return pipe_crc;
@@ -698,7 +683,7 @@ pipe_crc_new(int fd, enum pipe pipe, enum intel_pipe_crc_source source, int flag* least INTEL_PIPE_CRC_SOURCE_AUTO everywhere. */ igt_pipe_crc_t * -igt_pipe_crc_new (int fd,enum pipe pipe,enum intel_pipe_crc_source source) +igt_pipe_crc_new (int fd,enum pipe pipe,const char *source) {return pipe_crc_new (fd, pipe, source,O_RDONLY ); }
@@ -716,7 +701,7 @@ igt_pipe_crc_new(int fd, enum pipe pipe, enum intel_pipe_crc_source source)* least INTEL_PIPE_CRC_SOURCE_AUTO everywhere. */ igt_pipe_crc_t * -igt_pipe_crc_new_nonblock (int fd,enum pipe pipe,enum intel_pipe_crc_source source) +igt_pipe_crc_new_nonblock (int fd,enum pipe pipe,const char *source) {return pipe_crc_new (fd, pipe, source,O_RDONLY |O_NONBLOCK ); }
@@ -735,6 +720,7 @@ void igt_pipe_crc_free(igt_pipe_crc_t *pipe_crc)close (pipe_crc->ctl_fd);close (pipe_crc->crc_fd);close (pipe_crc->dir); +free (pipe_crc->source);free (pipe_crc); }
@@ -801,7 +787,7 @@ static void read_one_crc(igt_pipe_crc_t *pipe_crc, igt_crc_t *out)*/ void igt_pipe_crc_start (igt_pipe_crc_t *pipe_crc) { -const char *src =pipe_crc_source_name (pipe_crc->source); +const char *src = pipe_crc->source;struct pollfd pfd;char buf[32 ];
lib/igt_debugfs.h +3 -35
@@ -82,39 +82,7 @@ typedef struct {uint32_t crc[DRM_MAX_CRC_NR ]; } igt_crc_t; -/** -* intel_pipe_crc_source: -* @INTEL_PIPE_CRC_SOURCE_NONE: No source -* @INTEL_PIPE_CRC_SOURCE_PLANE1: Plane 1 -* @INTEL_PIPE_CRC_SOURCE_PLANE2: Plane 2 -* @INTEL_PIPE_CRC_SOURCE_PF: Panel Filter -* @INTEL_PIPE_CRC_SOURCE_PIPE: Pipe -* @INTEL_PIPE_CRC_SOURCE_TV: TV -* @INTEL_PIPE_CRC_SOURCE_DP_B: DisplayPort B -* @INTEL_PIPE_CRC_SOURCE_DP_C: DisplayPort C -* @INTEL_PIPE_CRC_SOURCE_DP_D: DisplayPort D -* @INTEL_PIPE_CRC_SOURCE_AUTO: Automatic source selection -* @INTEL_PIPE_CRC_SOURCE_MAX: Number of available sources -* -* Enumeration of all supported pipe CRC sources. Not all platforms and all -* outputs support all of them. Generic tests should just use -* INTEL_PIPE_CRC_SOURCE_AUTO. It should always map to an end-of-pipe CRC -* suitable for checking planes, cursor, color correction and any other -* output-agnostic features. -*/ -enum intel_pipe_crc_source { -INTEL_PIPE_CRC_SOURCE_NONE , -INTEL_PIPE_CRC_SOURCE_PLANE1 , -INTEL_PIPE_CRC_SOURCE_PLANE2 , -INTEL_PIPE_CRC_SOURCE_PF , -INTEL_PIPE_CRC_SOURCE_PIPE , -INTEL_PIPE_CRC_SOURCE_TV , -INTEL_PIPE_CRC_SOURCE_DP_B , -INTEL_PIPE_CRC_SOURCE_DP_C , -INTEL_PIPE_CRC_SOURCE_DP_D , -INTEL_PIPE_CRC_SOURCE_AUTO , -INTEL_PIPE_CRC_SOURCE_MAX , -}; +#define INTEL_PIPE_CRC_SOURCE_AUTO "auto"void igt_assert_crc_equal (const igt_crc_t *a,const igt_crc_t *b);bool igt_check_crc_equal (const igt_crc_t *a,const igt_crc_t *b);
@@ -123,9 +91,9 @@ char *igt_crc_to_string(igt_crc_t *crc);void igt_require_pipe_crc (int fd);igt_pipe_crc_t * -igt_pipe_crc_new (int fd,enum pipe pipe,enum intel_pipe_crc_source source); +igt_pipe_crc_new (int fd,enum pipe pipe,const char *source);igt_pipe_crc_t * -igt_pipe_crc_new_nonblock (int fd,enum pipe pipe,enum intel_pipe_crc_source source); +igt_pipe_crc_new_nonblock (int fd,enum pipe pipe,const char *source);void igt_pipe_crc_free (igt_pipe_crc_t *pipe_crc);void igt_pipe_crc_start (igt_pipe_crc_t *pipe_crc);void igt_pipe_crc_stop (igt_pipe_crc_t *pipe_crc);
Signature · 6 lines
2.19.2 _______________________________________________ igt-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/igt-dev
Patchwork
CI[igt-dev] ✓ Fi.CI.BAT: success for lib/debugfs: Nuke enum intel_pipe_crc_source (rev2)
In reply to Ville Syrjala via igt-dev== Series Details ==
== Series Details ==
Series: lib/debugfs: Nuke enum intel_pipe_crc_source (rev2)
URL : https://patchwork.freedesktop.org/series/56731/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_5642 -> IGTPW_2462
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/56731/revisions/2/mbox/
Known issues
------------
Here are the changes found in IGTPW_2462 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_basic@readonly-bsd2:
- fi-pnv-d510: NOTRUN -> SKIP [fdo#109271] +71
* igt@kms_busy@basic-flip-c:
- fi-pnv-d510: NOTRUN -> SKIP [fdo#109271] / [fdo#109278]
* igt@kms_frontbuffer_tracking@basic:
- fi-byt-clapper: PASS -> FAIL [fdo#103167]
* igt@kms_pipe_crc_basic@nonblocking-crc-pipe-a:
- fi-byt-clapper: PASS -> FAIL [fdo#107362]
#### Possible fixes ####
* igt@gem_ctx_switch@basic-default:
- {fi-icl-y}: INCOMPLETE [fdo#108569] -> PASS
* igt@kms_pipe_crc_basic@nonblocking-crc-pipe-a-frame-sequence:
- fi-byt-clapper: FAIL [fdo#103191] / [fdo#107362] -> PASS
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#103191]: https://bugs.freedesktop.org/show_bug.cgi?id=103191
[fdo#105998]: https://bugs.freedesktop.org/show_bug.cgi?id=105998
[fdo#107362]: https://bugs.freedesktop.org/show_bug.cgi?id=107362
[fdo#108569]: https://bugs.freedesktop.org/show_bug.cgi?id=108569
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109276]: https://bugs.freedesktop.org/show_bug.cgi?id=109276
[fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
[fdo#109284]: https://bugs.freedesktop.org/show_bug.cgi?id=109284
[fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[fdo#109289]: https://bugs.freedesktop.org/show_bug.cgi?id=109289
[fdo#109294]: https://bugs.freedesktop.org/show_bug.cgi?id=109294
[fdo#109315]: https://bugs.freedesktop.org/show_bug.cgi?id=109315
[fdo#109527]: https://bugs.freedesktop.org/show_bug.cgi?id=109527
[fdo#109528]: https://bugs.freedesktop.org/show_bug.cgi?id=109528
[fdo#109530]: https://bugs.freedesktop.org/show_bug.cgi?id=109530
Participating hosts (45 -> 40)
------------------------------
Additional (1): fi-pnv-d510
Missing (6): fi-kbl-soraka fi-ilk-m540 fi-hsw-4200u fi-bsw-cyan fi-bdw-samus fi-snb-2600
Build changes
-------------
* IGT: IGT_4844 -> IGTPW_2462
CI_DRM_5642: c35913ab36f318bf8981f9b3576035a95659591e @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_2462: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_2462/
IGT_4844: ee6e006202a50c5aef373c0b075027ed7177935a @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_2462/
_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev
Patchwork
CI[igt-dev] ✓ Fi.CI.IGT: success for lib/debugfs: Nuke enum intel_pipe_crc_source (rev2)
In reply to Ville Syrjala via igt-dev== Series Details ==
== Series Details ==
Series: lib/debugfs: Nuke enum intel_pipe_crc_source (rev2)
URL : https://patchwork.freedesktop.org/series/56731/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_5642_full -> IGTPW_2462_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/56731/revisions/2/mbox/
Known issues
------------
Here are the changes found in IGTPW_2462_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_flush@basic-batch-kernel-default-cmd:
- shard-glk: NOTRUN -> SKIP [fdo#109271] +8
* igt@gem_exec_schedule@preempt-other-chain-blt:
- shard-snb: NOTRUN -> SKIP [fdo#109271] +165
* igt@gem_mmap_wc@write-cpu-read-wc:
- shard-snb: PASS -> INCOMPLETE [fdo#105411] / [fdo#107469]
* igt@kms_busy@extended-modeset-hang-newfb-with-reset-render-b:
- shard-snb: NOTRUN -> DMESG-WARN [fdo#107956]
* igt@kms_busy@extended-modeset-hang-oldfb-render-f:
- shard-glk: NOTRUN -> SKIP [fdo#109271] / [fdo#109278]
* igt@kms_busy@extended-pageflip-modeset-hang-oldfb-render-d:
- shard-apl: NOTRUN -> SKIP [fdo#109271] / [fdo#109278] +2
* igt@kms_color@pipe-a-ctm-max:
- shard-glk: NOTRUN -> FAIL [fdo#108147]
* igt@kms_cursor_crc@cursor-128x128-random:
- shard-apl: PASS -> FAIL [fdo#103232] +3
* igt@kms_cursor_crc@cursor-256x256-sliding:
- shard-glk: NOTRUN -> FAIL [fdo#103232]
* igt@kms_cursor_crc@cursor-64x21-sliding:
- shard-kbl: PASS -> FAIL [fdo#103232]
* igt@kms_cursor_crc@cursor-alpha-opaque:
- shard-apl: PASS -> FAIL [fdo#109350]
* igt@kms_cursor_legacy@2x-long-nonblocking-modeset-vs-cursor-atomic:
- shard-glk: NOTRUN -> FAIL [fdo#105454] / [fdo#106509]
* igt@kms_flip@2x-plain-flip-ts-check:
- shard-apl: NOTRUN -> SKIP [fdo#109271] +28
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-mmap-gtt:
- shard-snb: PASS -> SKIP [fdo#109271] +2
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-pwrite:
- shard-apl: PASS -> FAIL [fdo#103167] +5
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-render:
- shard-kbl: PASS -> FAIL [fdo#103167]
* igt@kms_frontbuffer_tracking@fbc-2p-primscrn-spr-indfb-draw-mmap-cpu:
- shard-glk: PASS -> FAIL [fdo#103167] +6
* igt@kms_frontbuffer_tracking@fbcpsr-2p-primscrn-cur-indfb-draw-render:
- shard-kbl: NOTRUN -> SKIP [fdo#109271] +9
* igt@kms_plane@plane-position-covered-pipe-a-planes:
- shard-apl: PASS -> FAIL [fdo#103166] +2
* igt@kms_plane_alpha_blend@pipe-b-alpha-7efc:
- shard-apl: NOTRUN -> FAIL [fdo#108145]
* igt@kms_plane_alpha_blend@pipe-c-alpha-opaque-fb:
- shard-snb: NOTRUN -> SKIP [fdo#109271] / [fdo#109278] +17
* igt@kms_plane_multiple@atomic-pipe-c-tiling-yf:
- shard-apl: NOTRUN -> FAIL [fdo#103166]
* igt@kms_rotation_crc@multiplane-rotation:
- shard-kbl: PASS -> INCOMPLETE [fdo#103665]
* igt@kms_setmode@basic:
- shard-apl: PASS -> FAIL [fdo#99912]
* igt@kms_sysfs_edid_timing:
- shard-apl: NOTRUN -> FAIL [fdo#100047]
* igt@kms_universal_plane@universal-plane-pipe-c-functional:
- shard-glk: PASS -> FAIL [fdo#103166] +6
* igt@kms_vblank@pipe-b-ts-continuation-modeset-rpm:
- shard-apl: PASS -> FAIL [fdo#104894]
#### Possible fixes ####
* igt@i915_pm_rpm@system-suspend:
- shard-kbl: INCOMPLETE [fdo#103665] / [fdo#107807] -> PASS
* igt@kms_atomic_transition@plane-all-modeset-transition:
- shard-kbl: INCOMPLETE [fdo#103665] -> PASS
* igt@kms_cursor_crc@cursor-128x128-suspend:
- shard-apl: FAIL [fdo#103191] / [fdo#103232] -> PASS
- shard-kbl: FAIL [fdo#103191] / [fdo#103232] -> PASS
* igt@kms_cursor_crc@cursor-256x85-sliding:
- shard-apl: FAIL [fdo#103232] -> PASS +3
* igt@kms_cursor_crc@cursor-64x64-onscreen:
- shard-kbl: FAIL [fdo#103232] -> PASS
* igt@kms_flip@plain-flip-fb-recreate-interruptible:
- shard-apl: INCOMPLETE [fdo#103927] -> PASS +2
* igt@kms_frontbuffer_tracking@fbc-1p-rte:
- shard-glk: FAIL [fdo#103167] / [fdo#105682] -> PASS
* igt@kms_plane@plane-position-covered-pipe-c-planes:
- shard-apl: FAIL [fdo#103166] -> PASS +1
- shard-kbl: FAIL [fdo#103166] -> PASS
* igt@kms_plane_multiple@atomic-pipe-b-tiling-none:
- shard-glk: FAIL [fdo#103166] -> PASS
* igt@kms_vblank@pipe-b-ts-continuation-dpms-rpm:
- shard-apl: FAIL [fdo#104894] -> PASS
- shard-kbl: FAIL [fdo#104894] -> PASS
* igt@perf_pmu@rc6:
- shard-kbl: SKIP [fdo#109271] -> PASS
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#100047]: https://bugs.freedesktop.org/show_bug.cgi?id=100047
[fdo#103166]: https://bugs.freedesktop.org/show_bug.cgi?id=103166
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#103191]: https://bugs.freedesktop.org/show_bug.cgi?id=103191
[fdo#103232]: https://bugs.freedesktop.org/show_bug.cgi?id=103232
[fdo#103665]: https://bugs.freedesktop.org/show_bug.cgi?id=103665
[fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
[fdo#104894]: https://bugs.freedesktop.org/show_bug.cgi?id=104894
[fdo#105411]: https://bugs.freedesktop.org/show_bug.cgi?id=105411
[fdo#105454]: https://bugs.freedesktop.org/show_bug.cgi?id=105454
[fdo#105682]: https://bugs.freedesktop.org/show_bug.cgi?id=105682
[fdo#106509]: https://bugs.freedesktop.org/show_bug.cgi?id=106509
[fdo#107469]: https://bugs.freedesktop.org/show_bug.cgi?id=107469
[fdo#107807]: https://bugs.freedesktop.org/show_bug.cgi?id=107807
[fdo#107956]: https://bugs.freedesktop.org/show_bug.cgi?id=107956
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#108147]: https://bugs.freedesktop.org/show_bug.cgi?id=108147
[fdo#108739]: https://bugs.freedesktop.org/show_bug.cgi?id=108739
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
[fdo#109350]: https://bugs.freedesktop.org/show_bug.cgi?id=109350
[fdo#99912]: https://bugs.freedesktop.org/show_bug.cgi?id=99912
Participating hosts (6 -> 5)
------------------------------
Missing (1): shard-skl
Build changes
-------------
* IGT: IGT_4844 -> IGTPW_2462
* Piglit: piglit_4509 -> None
CI_DRM_5642: c35913ab36f318bf8981f9b3576035a95659591e @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_2462: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_2462/
IGT_4844: ee6e006202a50c5aef373c0b075027ed7177935a @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_2462/
_______________________________________________
igt-dev mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/igt-dev