blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

drm backend: detect non-desktop outputs

This commit is contained in:
Drew DeVault 2019-06-27 15:12:35 -04:00
parent 481fbbca58
commit 05ed202183
4 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
backend/drm/drm.c
View File

@ -1206,8 +1206,8 @@ void scan_drm_connectors(struct wlr_drm_backend *drm) {
drm->display);
struct wl_event_loop *ev = wl_display_get_event_loop(drm->display);
wlr_conn->retry_pageflip = wl_event_loop_add_timer(ev, retry_pageflip,
wlr_conn);
wlr_conn->retry_pageflip = wl_event_loop_add_timer(
ev, retry_pageflip, wlr_conn);
wlr_conn->state = WLR_DRM_CONN_DISCONNECTED;
wlr_conn->id = drm_conn->connector_id;
@ -1269,6 +1269,12 @@ void scan_drm_connectors(struct wlr_drm_backend *drm) {
get_drm_connector_props(drm->fd, wlr_conn->id, &wlr_conn->props);
uint64_t non_desktop;
if (get_drm_prop(drm->fd, wlr_conn->id,
wlr_conn->props.non_desktop, &non_desktop)) {
wlr_conn->output.non_desktop = non_desktop;
}
size_t edid_len = 0;
uint8_t *edid = get_drm_prop_blob(drm->fd,
wlr_conn->id, wlr_conn->props.edid, &edid_len);

1
backend/drm/properties.c
View File

@ -24,6 +24,7 @@ static const struct prop_info connector_info[] = {
{ "EDID", INDEX(edid) },
{ "PATH", INDEX(path) },
{ "link-status", INDEX(link_status) },
{ "non-desktop", INDEX(non_desktop) },
#undef INDEX
};

1
include/backend/drm/properties.h
View File

@ -16,6 +16,7 @@ union wlr_drm_connector_props {
uint32_t dpms;
uint32_t link_status; // not guaranteed to exist
uint32_t path;
uint32_t non_desktop;
// atomic-modesetting only

3
include/wlr/types/wlr_output.h
View File

@ -112,6 +112,9 @@ struct wlr_output {
bool frame_pending;
float transform_matrix[9];
// true, for example, with VR headsets
bool non_desktop;
struct wlr_output_state pending;
struct {