drm/debugfs: Fix framebuffer debugfs file init
Subsystems (2)
PATCH 1/1 drm/debugfs: Fix framebuffer debugfs file init
The introduction of: drm/framebuffer: Add framebuffer debugfs file broke vgem. That patch assumed that all drivers had initialized the dev->mode_config.fb_lock mutex which happens in drm_mode_config_init(). vgem doesn't need to call drm_mode_config_init().
Fix this by only creating the framebuffer debugfs file for modesetting drivers.
--- drivers/gpu/drm/drm_debugfs.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/gpu/drm/drm_debugfs.c +6 -4
@@ -158,10 +158,12 @@ int drm_debugfs_init(struct drm_minor *minor, int minor_id, } } - ret =drm_framebuffer_debugfs_init (minor); -if (ret) { -DRM_ERROR ("Failed to create framebuffer debugfs file\n" ); -return ret; +if (drm_core_check_feature (dev,DRIVER_MODESET )) { + ret =drm_framebuffer_debugfs_init (minor); +if (ret) { +DRM_ERROR ("Failed to create framebuffer debugfs file\n" ); +return ret; + } }if (dev->driver->debugfs_init) {
Signature · 6 lines
2.14.2 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Patchwork
CI✗ Fi.CI.BAT: warning for drm/debugfs: Fix framebuffer debugfs file init
== Series Details ==
== Series Details ==
Series: drm/debugfs: Fix framebuffer debugfs file init
URL : https://patchwork.freedesktop.org/series/33747/
State : warning
== Summary ==
Series 33747v1 drm/debugfs: Fix framebuffer debugfs file init
https://patchwork.freedesktop.org/api/1.0/series/33747/revisions/1/mbox/
Test chamelium:
Subgroup dp-crc-fast:
fail -> PASS (fi-kbl-7500u) fdo#102514
Test kms_cursor_legacy:
Subgroup basic-flip-after-cursor-varying-size:
pass -> SKIP (fi-hsw-4770r)
Test kms_pipe_crc_basic:
Subgroup read-crc-pipe-b-frame-sequence:
pass -> SKIP (fi-hsw-4770r) fdo#102332
Subgroup suspend-read-crc-pipe-b:
pass -> INCOMPLETE (fi-snb-2520m) fdo#103713
Test vgem_basic:
Subgroup debugfs:
dmesg-fail -> PASS (fi-gdg-551) fdo#103703 +27
dmesg-fail -> PASS (fi-kbl-7567u) fdo#103165
Subgroup dmabuf-export:
incomplete -> PASS (fi-bxt-j4205) fdo#103706 +1
Subgroup unload:
incomplete -> PASS (fi-gdg-551) fdo#103702 +26fdo#102514 https://bugs.freedesktop.org/show_bug.cgi?id=102514
fdo#102332 https://bugs.freedesktop.org/show_bug.cgi?id=102332
fdo#103713 https://bugs.freedesktop.org/show_bug.cgi?id=103713
fdo#103703 https://bugs.freedesktop.org/show_bug.cgi?id=103703
fdo#103165 https://bugs.freedesktop.org/show_bug.cgi?id=103165
fdo#103706 https://bugs.freedesktop.org/show_bug.cgi?id=103706
fdo#103702 https://bugs.freedesktop.org/show_bug.cgi?id=103702
fi-bdw-5557u total:289 pass:268 dwarn:0 dfail:0 fail:0 skip:21 time:442s fi-bdw-gvtdvm total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:452s fi-blb-e6850 total:289 pass:223 dwarn:1 dfail:0 fail:0 skip:65 time:378s fi-bsw-n3050 total:289 pass:243 dwarn:0 dfail:0 fail:0 skip:46 time:542s fi-bwr-2160 total:289 pass:183 dwarn:0 dfail:0 fail:0 skip:106 time:274s fi-bxt-dsi total:289 pass:259 dwarn:0 dfail:0 fail:0 skip:30 time:503s fi-bxt-j4205 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:504s fi-byt-j1900 total:289 pass:254 dwarn:0 dfail:0 fail:0 skip:35 time:499s fi-byt-n2820 total:289 pass:250 dwarn:0 dfail:0 fail:0 skip:39 time:487s fi-elk-e7500 total:289 pass:229 dwarn:0 dfail:0 fail:0 skip:60 time:430s fi-gdg-551 total:289 pass:178 dwarn:1 dfail:0 fail:1 skip:109 time:263s fi-glk-1 total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:540s fi-hsw-4770 total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:434s fi-hsw-4770r total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:436s fi-ilk-650 total:289 pass:228 dwarn:0 dfail:0 fail:0 skip:61 time:423s fi-ivb-3520m total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:481s fi-ivb-3770 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:457s fi-kbl-7500u total:289 pass:264 dwarn:1 dfail:0 fail:0 skip:24 time:486s fi-kbl-7560u total:289 pass:270 dwarn:0 dfail:0 fail:0 skip:19 time:532s fi-kbl-7567u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:479s fi-kbl-r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:530s fi-pnv-d510 total:289 pass:222 dwarn:1 dfail:0 fail:0 skip:66 time:568s fi-skl-6260u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:448s fi-skl-6600u total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:542s fi-skl-6700hq total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:564s fi-skl-6700k total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:517s fi-skl-6770hq total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:492s fi-skl-gvtdvm total:289 pass:266 dwarn:0 dfail:0 fail:0 skip:23 time:460s fi-snb-2520m total:246 pass:212 dwarn:0 dfail:0 fail:0 skip:33 fi-snb-2600 total:289 pass:249 dwarn:0 dfail:0 fail:0 skip:40 time:426s
Blacklisted hosts:
fi-cfl-s total:289 pass:254 dwarn:3 dfail:0 fail:0 skip:32 time:539s
0ae838346d57d7767dec9e25f9d534faaa59ea7f drm-tip: 2017y-11m-13d-20h-43m-56s UTC integration manifest c2a756011d0c drm/debugfs: Fix framebuffer debugfs file init
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7104/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 11 lines · Noralf Trønnes
The introduction of: drm/framebuffer: Add framebuffer debugfs file broke vgem. That patch assumed that all drivers had initialized the
dev->mode_config.fb_lockmutex which happens indrm_mode_config_init(). vgem doesn't need to calldrm_mode_config_init().Fix this by only creating the framebuffer debugfs file for modesetting drivers.
Fixes 45d58b40292b ("drm/framebuffer: Add framebuffer debugfs file")Suggested-by Chris Wilson <[email protected]>Signed-off-by Noralf Trønnes <[email protected]>
Can someone pushed this to drm-misc, I think it's blocking the intel CI ppl.
Dave.
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 9 lines · Dave Airlie
Quoted 8 lines · Noralf Trønnes
The introduction of: drm/framebuffer: Add framebuffer debugfs file broke vgem. That patch assumed that all drivers had initialized the
dev->mode_config.fb_lockmutex which happens indrm_mode_config_init(). vgem doesn't need to calldrm_mode_config_init().Fix this by only creating the framebuffer debugfs file for modesetting drivers.
Quoted 7 lines
Quoted 3 lines
Fixes 45d58b40292b ("drm/framebuffer: Add framebuffer debugfs file")Suggested-by Chris Wilson <[email protected]>Signed-off-by Noralf Trønnes <[email protected]>Reviewed-by Dave Airlie <[email protected]>Can someone pushed this to drm-misc, I think it's blocking the intel CI ppl.
Pushed, thanks for the patch and review.
On the one hand, we badly need to have CI running on non-Intel drm core patches too. On the other hand, I'm still not sure if we're producing good enough results yet to expose to all of drm. The false negatives are too frequent I fear.
BR,
Jani.
Quoted 6 lines
Dave.
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.IGT: success for drm/debugfs: Fix framebuffer debugfs file init
In reply to Noralf Trønnes== Series Details ==
== Series Details ==
Series: drm/debugfs: Fix framebuffer debugfs file init
URL : https://patchwork.freedesktop.org/series/33747/
State : success
== Summary ==
Test kms_flip:
Subgroup plain-flip-ts-check-interruptible:
fail -> PASS (shard-hsw) fdo#100368 +1
Test kms_busy:
Subgroup extended-modeset-hang-oldfb-with-reset-render-a:
pass -> DMESG-WARN (shard-hsw) fdo#102249 +1
Test vgem_basic:
Subgroup debugfs:
incomplete -> PASS (shard-hsw) fdo#103703fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#102249 https://bugs.freedesktop.org/show_bug.cgi?id=102249
fdo#103703 https://bugs.freedesktop.org/show_bug.cgi?id=103703
shard-hsw total:2584 pass:1471 dwarn:3 dfail:1 fail:10 skip:1099 time:9504s
Blacklisted hosts:
shard-apl total:2584 pass:1621 dwarn:1 dfail:1 fail:25 skip:936 time:13276s shard-kbl total:2565 pass:1677 dwarn:34 dfail:2 fail:23 skip:828 time:11247s shard-snb total:2567 pass:1184 dwarn:2 dfail:0 fail:12 skip:1368 time:7640s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7104/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx