Skip to contentSkip to conversation

HAX: Do not restore mode through fbcon

PATCH New Maarten Lankhorst 2 participants 3 messages Oct 13, 2017

Subsystems (2)
lore
Share & tools
lore

Maarten Lankhorst

author maintainer
#0 lore raw

PATCH 1/1 HAX: Do not restore mode through fbcon

Lets try it and see what breaks!

---
 drivers/gpu/drm/drm_fb_helper.c | 30 +++++++++++-------------------
 1 file changed, 11 insertions(+), 19 deletions(-)
drivers/gpu/drm/drm_fb_helper.c +11 -19
index 6a31d13f2f81..0414da99de5b 100644
@@ -352,7 +352,8 @@ static int restore_fbdev_mode_atomic(struct drm_fb_helper *fb_helper, bool activ
 	struct drm_device *dev = fb_helper->dev;
 	struct drm_plane *plane;
 	struct drm_atomic_state *state;
-	int i, ret;
+	struct drm_crtc *crtc;
+	int ret;
 	unsigned int plane_mask;
 	struct drm_modeset_acquire_ctx ctx;
 
@@ -381,32 +382,23 @@ static int restore_fbdev_mode_atomic(struct drm_fb_helper *fb_helper, bool activ
 		plane->old_fb = plane->fb;
 		plane_mask |= 1 << drm_plane_index(plane);
 
-		/* disable non-primary: */
-		if (plane->type == DRM_PLANE_TYPE_PRIMARY)
-			continue;
-
 		ret = __drm_atomic_helper_disable_plane(plane, plane_state);
 		if (ret != 0)
 			goto out_state;
 	}
 
-	for (i = 0; i < fb_helper->crtc_count; i++) {
-		struct drm_mode_set *mode_set = &fb_helper->crtc_info[i].mode_set;
+	drm_for_each_crtc(crtc, dev) {
+		struct drm_crtc_state *crtc_state = drm_atomic_get_crtc_state(state, crtc);
 
-		ret = __drm_atomic_helper_set_config(mode_set, state);
-		if (ret != 0)
+		if (IS_ERR(crtc_state)) {
+			ret = PTR_ERR(crtc_state);
 			goto out_state;
-
-		/*
-		 * __drm_atomic_helper_set_config() sets active when a
-		 * mode is set, unconditionally clear it if we force DPMS off
-		 */
-		if (!active) {
-			struct drm_crtc *crtc = mode_set->crtc;
-			struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state, crtc);
-
-			crtc_state->active = false;
 		}
+
+		crtc_state->active = false;
+		ret = drm_atomic_set_mode_for_crtc(crtc_state, NULL);
+		if (ret)
+			goto out_state;
 	}
 
 	ret = drm_atomic_commit(state);
Signature · 6 lines
2.14.1

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

✗ Fi.CI.BAT: warning for HAX: Do not restore mode through fbcon

== Series Details ==

== Series Details ==

Series: HAX: Do not restore mode through fbcon
URL : https://patchwork.freedesktop.org/series/31893/
State : warning

== Summary ==

Series 31893v1 HAX: Do not restore mode through fbcon
https://patchwork.freedesktop.org/api/1.0/series/31893/revisions/1/mbox/

Test chamelium:

        Subgroup dp-crc-fast:
                fail       -> PASS       (fi-kbl-7500u) fdo#102514
        Subgroup hdmi-crc-fast:
                pass       -> DMESG-WARN (fi-skl-6700k) fdo#103019
        Subgroup common-hpd-after-suspend:
                dmesg-warn -> PASS       (fi-kbl-7500u) fdo#102505
Test debugfs_test:
        Subgroup read_all_entries:
                pass       -> DMESG-WARN (fi-ilk-650)
                pass       -> DMESG-WARN (fi-skl-6770hq)
Test gem_exec_suspend:
        Subgroup basic-s4-devices:
                pass       -> DMESG-WARN (fi-byt-j1900)
                dmesg-warn -> PASS       (fi-kbl-7567u) fdo#102846
Test gem_ringfill:
        Subgroup basic-default-hang:
                dmesg-warn -> PASS       (fi-blb-e6850) fdo#101600 +1
Test kms_frontbuffer_tracking:
        Subgroup basic:
                pass       -> DMESG-WARN (fi-kbl-7567u)
Test kms_pipe_crc_basic:
        Subgroup hang-read-crc-pipe-a:
                pass       -> DMESG-WARN (fi-kbl-7567u)
        Subgroup suspend-read-crc-pipe-a:
                pass       -> DMESG-WARN (fi-byt-n2820)
        Subgroup suspend-read-crc-pipe-b:
                dmesg-warn -> PASS       (fi-byt-j1900) fdo#101705 +1
Test pm_rpm:
        Subgroup basic-pci-d3-state:
                pass       -> DMESG-WARN (fi-kbl-7567u)
        Subgroup basic-rte:
                pass       -> DMESG-WARN (fi-kbl-7567u)
Test prime_busy:
        Subgroup basic-wait-after-default:
                pass       -> DMESG-WARN (fi-kbl-7567u)
Test drv_module_reload:
        Subgroup basic-reload:
                dmesg-warn -> PASS       (fi-gdg-551) fdo#102707
                dmesg-warn -> PASS       (fi-kbl-7567u) fdo#102294 +2

fdo#102514 https://bugs.freedesktop.org/show_bug.cgi?id=102514
fdo#103019 https://bugs.freedesktop.org/show_bug.cgi?id=103019
fdo#102505 https://bugs.freedesktop.org/show_bug.cgi?id=102505
fdo#102846 https://bugs.freedesktop.org/show_bug.cgi?id=102846
fdo#101600 https://bugs.freedesktop.org/show_bug.cgi?id=101600
fdo#101705 https://bugs.freedesktop.org/show_bug.cgi?id=101705
fdo#102707 https://bugs.freedesktop.org/show_bug.cgi?id=102707
fdo#102294 https://bugs.freedesktop.org/show_bug.cgi?id=102294

fi-bdw-5557u     total:289  pass:268  dwarn:0   dfail:0   fail:0   skip:21  time:447s
fi-bdw-gvtdvm    total:289  pass:265  dwarn:0   dfail:0   fail:0   skip:24  time:461s
fi-blb-e6850     total:289  pass:224  dwarn:0   dfail:0   fail:0   skip:65  time:374s
fi-bsw-n3050     total:289  pass:243  dwarn:0   dfail:0   fail:0   skip:46  time:584s
fi-bwr-2160      total:289  pass:183  dwarn:0   dfail:0   fail:0   skip:106 time:273s
fi-bxt-dsi       total:289  pass:259  dwarn:0   dfail:0   fail:0   skip:30  time:539s
fi-bxt-j4205     total:289  pass:260  dwarn:0   dfail:0   fail:0   skip:29  time:536s
fi-byt-j1900     total:289  pass:253  dwarn:1   dfail:0   fail:0   skip:35  time:544s
fi-byt-n2820     total:289  pass:249  dwarn:1   dfail:0   fail:0   skip:39  time:528s
fi-elk-e7500     total:289  pass:229  dwarn:0   dfail:0   fail:0   skip:60  time:418s
fi-gdg-551       total:289  pass:179  dwarn:0   dfail:0   fail:1   skip:109 time:261s
fi-glk-1         total:289  pass:261  dwarn:0   dfail:0   fail:0   skip:28  time:612s
fi-hsw-4770r     total:289  pass:262  dwarn:0   dfail:0   fail:0   skip:27  time:436s
fi-ilk-650       total:289  pass:227  dwarn:1   dfail:0   fail:0   skip:61  time:446s
fi-ivb-3520m     total:289  pass:260  dwarn:0   dfail:0   fail:0   skip:29  time:477s
fi-ivb-3770      total:289  pass:260  dwarn:0   dfail:0   fail:0   skip:29  time:471s
fi-kbl-7500u     total:289  pass:265  dwarn:0   dfail:0   fail:0   skip:24  time:487s
fi-kbl-7567u     total:289  pass:264  dwarn:5   dfail:0   fail:0   skip:20  time:501s
fi-kbl-r         total:289  pass:262  dwarn:0   dfail:0   fail:0   skip:27  time:557s
fi-pnv-d510      total:289  pass:223  dwarn:0   dfail:0   fail:0   skip:66  time:643s
fi-skl-6260u     total:289  pass:269  dwarn:0   dfail:0   fail:0   skip:20  time:475s
fi-skl-6700hq    total:289  pass:263  dwarn:0   dfail:0   fail:0   skip:26  time:625s
fi-skl-6700k     total:289  pass:264  dwarn:1   dfail:0   fail:0   skip:24  time:535s
fi-skl-6770hq    total:289  pass:268  dwarn:1   dfail:0   fail:0   skip:20  time:506s
fi-skl-gvtdvm    total:289  pass:266  dwarn:0   dfail:0   fail:0   skip:23  time:483s
fi-snb-2520m     total:289  pass:250  dwarn:0   dfail:0   fail:0   skip:39  time:545s
fi-snb-2600      total:289  pass:249  dwarn:0   dfail:0   fail:0   skip:40  time:409s

490bd134d63554815d2ea6ff56e6d32fd50ff472 drm-tip: 2017y-10m-12d-20h-08m-10s UTC integration manifest b74f9f7133f6 HAX: Do not restore mode through fbcon

== Logs ==

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

#2 lore raw

✗ Fi.CI.IGT: failure for HAX: Do not restore mode through fbcon

In reply to Maarten Lankhorst
== Series Details ==

== Series Details ==

Series: HAX: Do not restore mode through fbcon
URL : https://patchwork.freedesktop.org/series/31893/
State : failure

== Summary ==

Test kms_chv_cursor_fail:

        Subgroup pipe-C-256x256-bottom-edge:
                pass       -> INCOMPLETE (shard-hsw)
        Subgroup pipe-C-64x64-bottom-edge:
                pass       -> INCOMPLETE (shard-hsw)
        Subgroup pipe-B-64x64-bottom-edge:
                pass       -> INCOMPLETE (shard-hsw)
Test kms_atomic:
        Subgroup crtc_invalid_params:
                pass       -> SKIP       (shard-hsw)
        Subgroup plane_cursor_legacy:
                pass       -> SKIP       (shard-hsw)
        Subgroup plane_primary_legacy:
                pass       -> SKIP       (shard-hsw)
        Subgroup plane_invalid_params_fence:
                pass       -> SKIP       (shard-hsw)
        Subgroup plane_invalid_params:
                pass       -> SKIP       (shard-hsw)
        Subgroup plane_overlay_legacy:
                pass       -> SKIP       (shard-hsw)
        Subgroup test_only:
                pass       -> SKIP       (shard-hsw)
        Subgroup crtc_invalid_params_fence:
                pass       -> SKIP       (shard-hsw)
Test gem_mmap_wc:
        Subgroup set-cache-level:
                pass       -> SKIP       (shard-hsw)
Test drm_read:
        Subgroup empty-nonblock:
                pass       -> SKIP       (shard-hsw)
        Subgroup invalid-buffer:
                pass       -> SKIP       (shard-hsw)
        Subgroup short-buffer-block:
                pass       -> SKIP       (shard-hsw)
        Subgroup empty-block:
                pass       -> SKIP       (shard-hsw)
        Subgroup short-buffer-nonblock:
                pass       -> SKIP       (shard-hsw)
Test kms_plane_lowres:
        Subgroup pipe-A-tiling-x:
                pass       -> SKIP       (shard-hsw)
        Subgroup pipe-A-tiling-none:
                pass       -> INCOMPLETE (shard-hsw)
Test kms_frontbuffer_tracking:
        Subgroup fbc-1p-primscrn-spr-indfb-fullscreen:
                pass       -> FAIL       (shard-hsw)
Test kms_plane_multiple:
        Subgroup atomic-pipe-B-tiling-x:
                pass       -> INCOMPLETE (shard-hsw)
Test kms_plane:
        Subgroup plane-panning-bottom-right-pipe-B-planes:
                pass       -> INCOMPLETE (shard-hsw)
Test kms_pipe_crc_basic:
        Subgroup nonblocking-crc-pipe-C-frame-sequence:
                pass       -> INCOMPLETE (shard-hsw)
        Subgroup read-crc-pipe-B:
                pass       -> INCOMPLETE (shard-hsw)
Test kms_flip:
        Subgroup rcs-wf_vblank-vs-dpms:
                pass       -> DMESG-WARN (shard-hsw) fdo#102614

fdo#102614 https://bugs.freedesktop.org/show_bug.cgi?id=102614

shard-hsw total:2195 pass:1212 dwarn:1 dfail:0 fail:10 skip:964 time:8307s

== Logs ==

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