MFH: r522232

x11-wm/cage: fix DRM session after r521656

After VT switch nothing was rendered. From debug log before/after:

 [backend/drm/drm.c:1485] Requesting modeset for 'DP-1'
+[backend/drm/drm.c:697] Modesetting 'DP-1' with '3840x2160@60000 mHz'
+[backend/drm/drm.c:592] Initializing renderer on connector 'DP-1'
+[GLES2] FS SIMD8 shader: 5 inst, 0 loops, 24 cycles, 0:0 spills:fills, Promoted 0 constants, compacted 80 to 48 bytes.
+[GLES2] FS SIMD16 shader: 5 inst, 0 loops, 34 cycles, 0:0 spills:fills, Promoted 0 constants, compacted 80 to 48 bytes.
+[GLES2] VS SIMD8 shader: 28 inst, 0 loops, 116 cycles, 0:0 spills:fills, Promoted 0 constants, compacted 448 to 336 bytes.
+[GLES2] FS SIMD16 shader: 2 inst, 0 loops, 0 cycles, 0:0 spills:fills, Promoted 0 constants, compacted 32 to 32 bytes.

Approved by:	ports-secteam blanket
This commit is contained in:
Jan Beich 2020-01-06 14:01:22 +00:00
parent b47bb99222
commit 511dd2b92c
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/branches/2020Q1/; revision=522233
2 changed files with 14 additions and 1 deletions

View File

@ -3,7 +3,7 @@
PORTNAME= cage
DISTVERSIONPREFIX= v
DISTVERSION= 0.1.1
PORTREVISION= 5
PORTREVISION= 6
CATEGORIES= x11-wm
MAINTAINER= jbeich@FreeBSD.org

View File

@ -1,4 +1,5 @@
https://github.com/Hjdskes/cage/commit/33bb3c818c59
https://github.com/Hjdskes/cage/commit/51e6c760da51
--- cage.c.orig 2019-06-03 17:55:52 UTC
+++ cage.c
@ -18,3 +19,15 @@ https://github.com/Hjdskes/cage/commit/33bb3c818c59
wlr_output_layout_destroy(server.output_layout);
/* This function is not null-safe, but we only ever get here
with a proper wl_display. */
--- output.c.orig 2019-06-03 17:55:52 UTC
+++ output.c
@@ -386,6 +386,9 @@ handle_new_output(struct wl_listener *listener, void *
/* Place the cursor in the center of the screen. */
wlr_cursor_warp(server->seat->cursor, NULL, wlr_output->width / 2, wlr_output->height / 2);
wlr_output_damage_add_whole(server->output->damage);
+
+ wlr_output_enable(wlr_output, true);
+ wlr_output_commit(wlr_output);
}
void