* [igt-dev] [PATCH i-g-t] lib: Don't fail if plane IN_FORMATS not present
@ 2018-03-21 11:09 Daniel Stone
2018-03-21 12:01 ` Ville Syrjälä
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Daniel Stone @ 2018-03-21 11:09 UTC (permalink / raw)
To: igt-dev
igt_display_init() now unconditionally tries to get the plane IN_FORMATS
blob, which causes a hard assert failure if we don't have the property
present.
Check if it's there and return early if not.
Signed-off-by: Daniel Stone <daniels@collabora.com>
Fixes: 98f7614bd725 ("lib: Parse plane IN_FORMATS blobifiers into a nicer form")
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
---
lib/igt_kms.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/lib/igt_kms.c b/lib/igt_kms.c
index 7222642e..93240427 100644
--- a/lib/igt_kms.c
+++ b/lib/igt_kms.c
@@ -3957,6 +3957,9 @@ static void igt_fill_plane_format_mod(igt_display_t *display, igt_plane_t *plane
int idx = 0;
int count;
+ if (!igt_plane_has_prop(plane, IGT_PLANE_IN_FORMATS))
+ return;
+
blob_id = igt_plane_get_prop(plane, IGT_PLANE_IN_FORMATS);
blob = drmModeGetPropertyBlob(display->drm_fd, blob_id);
--
2.16.2
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [igt-dev] [PATCH i-g-t] lib: Don't fail if plane IN_FORMATS not present
2018-03-21 11:09 [igt-dev] [PATCH i-g-t] lib: Don't fail if plane IN_FORMATS not present Daniel Stone
@ 2018-03-21 12:01 ` Ville Syrjälä
2018-03-21 12:15 ` Daniel Stone
2018-03-21 12:05 ` [igt-dev] ✓ Fi.CI.BAT: success for " Patchwork
2018-03-21 14:17 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
2 siblings, 1 reply; 5+ messages in thread
From: Ville Syrjälä @ 2018-03-21 12:01 UTC (permalink / raw)
To: Daniel Stone; +Cc: igt-dev
On Wed, Mar 21, 2018 at 11:09:48AM +0000, Daniel Stone wrote:
> igt_display_init() now unconditionally tries to get the plane IN_FORMATS
> blob, which causes a hard assert failure if we don't have the property
> present.
That's quite odd. I'm pretty sure I tested this with blobifiers disabled
in i915 when I did https://patchwork.freedesktop.org/series/40113/ but
somehow I did not hit that assert. Makes me wonder what I actually
tested.
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> Check if it's there and return early if not.
>
> Signed-off-by: Daniel Stone <daniels@collabora.com>
> Fixes: 98f7614bd725 ("lib: Parse plane IN_FORMATS blobifiers into a nicer form")
> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Cc: Chris Wilson <chris@chris-wilson.co.uk>
> ---
> lib/igt_kms.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/lib/igt_kms.c b/lib/igt_kms.c
> index 7222642e..93240427 100644
> --- a/lib/igt_kms.c
> +++ b/lib/igt_kms.c
> @@ -3957,6 +3957,9 @@ static void igt_fill_plane_format_mod(igt_display_t *display, igt_plane_t *plane
> int idx = 0;
> int count;
>
> + if (!igt_plane_has_prop(plane, IGT_PLANE_IN_FORMATS))
> + return;
> +
> blob_id = igt_plane_get_prop(plane, IGT_PLANE_IN_FORMATS);
>
> blob = drmModeGetPropertyBlob(display->drm_fd, blob_id);
> --
> 2.16.2
--
Ville Syrjälä
Intel OTC
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [igt-dev] [PATCH i-g-t] lib: Don't fail if plane IN_FORMATS not present
2018-03-21 12:01 ` Ville Syrjälä
@ 2018-03-21 12:15 ` Daniel Stone
0 siblings, 0 replies; 5+ messages in thread
From: Daniel Stone @ 2018-03-21 12:15 UTC (permalink / raw)
To: Ville Syrjälä; +Cc: igt-dev
Hi Ville,
On 21 March 2018 at 12:01, Ville Syrjälä <ville.syrjala@linux.intel.com> wrote:
> On Wed, Mar 21, 2018 at 11:09:48AM +0000, Daniel Stone wrote:
>> igt_display_init() now unconditionally tries to get the plane IN_FORMATS
>> blob, which causes a hard assert failure if we don't have the property
>> present.
>
> That's quite odd. I'm pretty sure I tested this with blobifiers disabled
> in i915 when I did https://patchwork.freedesktop.org/series/40113/ but
> somehow I did not hit that assert. Makes me wonder what I actually
> tested.
I can't shed any light on that question, I'm afraid. ;)
> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Pushed now, thanks!
Cheers,
Daniel
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 5+ messages in thread
* [igt-dev] ✓ Fi.CI.BAT: success for lib: Don't fail if plane IN_FORMATS not present
2018-03-21 11:09 [igt-dev] [PATCH i-g-t] lib: Don't fail if plane IN_FORMATS not present Daniel Stone
2018-03-21 12:01 ` Ville Syrjälä
@ 2018-03-21 12:05 ` Patchwork
2018-03-21 14:17 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
2 siblings, 0 replies; 5+ messages in thread
From: Patchwork @ 2018-03-21 12:05 UTC (permalink / raw)
To: Daniel Stone; +Cc: igt-dev
== Series Details ==
Series: lib: Don't fail if plane IN_FORMATS not present
URL : https://patchwork.freedesktop.org/series/40368/
State : success
== Summary ==
IGT patchset tested on top of latest successful build
060c7e4f5a3622e01a25aebfeac5c6d1e3832a8c run-tests.sh: use meson build by default
with latest DRM-Tip kernel build CI_DRM_3958
9d737cebc219 drm-tip: 2018y-03m-20d-14h-56m-05s UTC integration manifest
No testlist changes.
---- Known issues:
Test kms_pipe_crc_basic:
Subgroup suspend-read-crc-pipe-a:
incomplete -> PASS (fi-cfl-s2) fdo#105641
fdo#105641 https://bugs.freedesktop.org/show_bug.cgi?id=105641
fi-bdw-5557u total:285 pass:264 dwarn:0 dfail:0 fail:0 skip:21 time:433s
fi-bdw-gvtdvm total:285 pass:261 dwarn:0 dfail:0 fail:0 skip:24 time:440s
fi-blb-e6850 total:285 pass:220 dwarn:1 dfail:0 fail:0 skip:64 time:383s
fi-bsw-n3050 total:285 pass:239 dwarn:0 dfail:0 fail:0 skip:46 time:545s
fi-bwr-2160 total:285 pass:180 dwarn:0 dfail:0 fail:0 skip:105 time:296s
fi-bxt-dsi total:285 pass:255 dwarn:0 dfail:0 fail:0 skip:30 time:513s
fi-bxt-j4205 total:285 pass:256 dwarn:0 dfail:0 fail:0 skip:29 time:514s
fi-byt-j1900 total:285 pass:250 dwarn:0 dfail:0 fail:0 skip:35 time:518s
fi-byt-n2820 total:285 pass:246 dwarn:0 dfail:0 fail:0 skip:39 time:501s
fi-cfl-8700k total:285 pass:257 dwarn:0 dfail:0 fail:0 skip:28 time:408s
fi-cfl-s2 total:285 pass:259 dwarn:0 dfail:0 fail:0 skip:26 time:584s
fi-cfl-u total:285 pass:259 dwarn:0 dfail:0 fail:0 skip:26 time:517s
fi-cnl-drrs total:285 pass:254 dwarn:3 dfail:0 fail:0 skip:28 time:516s
fi-elk-e7500 total:285 pass:225 dwarn:1 dfail:0 fail:0 skip:59 time:426s
fi-gdg-551 total:285 pass:177 dwarn:0 dfail:0 fail:0 skip:108 time:318s
fi-glk-1 total:285 pass:257 dwarn:0 dfail:0 fail:0 skip:28 time:539s
fi-hsw-4770 total:285 pass:258 dwarn:0 dfail:0 fail:0 skip:27 time:407s
fi-ilk-650 total:285 pass:225 dwarn:0 dfail:0 fail:0 skip:60 time:422s
fi-ivb-3520m total:285 pass:256 dwarn:0 dfail:0 fail:0 skip:29 time:479s
fi-ivb-3770 total:285 pass:252 dwarn:0 dfail:0 fail:0 skip:33 time:433s
fi-kbl-7500u total:285 pass:260 dwarn:1 dfail:0 fail:0 skip:24 time:474s
fi-kbl-7567u total:285 pass:265 dwarn:0 dfail:0 fail:0 skip:20 time:465s
fi-kbl-r total:285 pass:258 dwarn:0 dfail:0 fail:0 skip:27 time:512s
fi-pnv-d510 total:285 pass:219 dwarn:1 dfail:0 fail:0 skip:65 time:655s
fi-skl-6260u total:285 pass:265 dwarn:0 dfail:0 fail:0 skip:20 time:441s
fi-skl-6600u total:285 pass:258 dwarn:0 dfail:0 fail:0 skip:27 time:531s
fi-skl-6700k2 total:285 pass:261 dwarn:0 dfail:0 fail:0 skip:24 time:500s
fi-skl-6770hq total:285 pass:265 dwarn:0 dfail:0 fail:0 skip:20 time:488s
fi-skl-guc total:285 pass:257 dwarn:0 dfail:0 fail:0 skip:28 time:431s
fi-skl-gvtdvm total:285 pass:262 dwarn:0 dfail:0 fail:0 skip:23 time:445s
fi-snb-2520m total:285 pass:245 dwarn:0 dfail:0 fail:0 skip:40 time:568s
fi-snb-2600 total:285 pass:245 dwarn:0 dfail:0 fail:0 skip:40 time:400s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_1175/issues.html
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 5+ messages in thread* [igt-dev] ✓ Fi.CI.IGT: success for lib: Don't fail if plane IN_FORMATS not present
2018-03-21 11:09 [igt-dev] [PATCH i-g-t] lib: Don't fail if plane IN_FORMATS not present Daniel Stone
2018-03-21 12:01 ` Ville Syrjälä
2018-03-21 12:05 ` [igt-dev] ✓ Fi.CI.BAT: success for " Patchwork
@ 2018-03-21 14:17 ` Patchwork
2 siblings, 0 replies; 5+ messages in thread
From: Patchwork @ 2018-03-21 14:17 UTC (permalink / raw)
To: Daniel Stone; +Cc: igt-dev
== Series Details ==
Series: lib: Don't fail if plane IN_FORMATS not present
URL : https://patchwork.freedesktop.org/series/40368/
State : success
== Summary ==
---- Known issues:
Test kms_flip:
Subgroup 2x-dpms-vs-vblank-race:
pass -> FAIL (shard-hsw) fdo#103060 +1
Subgroup 2x-plain-flip-ts-check:
pass -> FAIL (shard-hsw) fdo#100368
Test kms_frontbuffer_tracking:
Subgroup fbc-1p-offscren-pri-indfb-draw-mmap-gtt:
pass -> FAIL (shard-apl) fdo#101623
Test kms_plane_multiple:
Subgroup atomic-pipe-a-tiling-x:
pass -> FAIL (shard-snb) fdo#103166
Test kms_rotation_crc:
Subgroup primary-rotation-180:
pass -> FAIL (shard-snb) fdo#103925
Test kms_setmode:
Subgroup basic:
pass -> FAIL (shard-apl) fdo#99912
Test kms_sysfs_edid_timing:
warn -> PASS (shard-apl) fdo#100047
Test kms_vblank:
Subgroup pipe-b-ts-continuation-dpms-suspend:
incomplete -> PASS (shard-hsw) fdo#105054
fdo#103060 https://bugs.freedesktop.org/show_bug.cgi?id=103060
fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#101623 https://bugs.freedesktop.org/show_bug.cgi?id=101623
fdo#103166 https://bugs.freedesktop.org/show_bug.cgi?id=103166
fdo#103925 https://bugs.freedesktop.org/show_bug.cgi?id=103925
fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912
fdo#100047 https://bugs.freedesktop.org/show_bug.cgi?id=100047
fdo#105054 https://bugs.freedesktop.org/show_bug.cgi?id=105054
shard-apl total:3478 pass:1813 dwarn:1 dfail:0 fail:9 skip:1655 time:13144s
shard-hsw total:3478 pass:1766 dwarn:1 dfail:0 fail:3 skip:1707 time:11782s
shard-snb total:3478 pass:1356 dwarn:1 dfail:0 fail:4 skip:2117 time:7249s
Blacklisted hosts:
shard-kbl total:3478 pass:1921 dwarn:20 dfail:0 fail:9 skip:1528 time:10052s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_1175/shards.html
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-03-21 14:17 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-03-21 11:09 [igt-dev] [PATCH i-g-t] lib: Don't fail if plane IN_FORMATS not present Daniel Stone
2018-03-21 12:01 ` Ville Syrjälä
2018-03-21 12:15 ` Daniel Stone
2018-03-21 12:05 ` [igt-dev] ✓ Fi.CI.BAT: success for " Patchwork
2018-03-21 14:17 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox