mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2026-02-22 01:40:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

backend/drm: add support for suggested output position prop

Browse source 
Virtualised outputs use the "suggested X" and "suggested Y" DRM props to
indicate their relative position on the host WM.

This change adds members `suggested_x` and `suggested_y` to `struct
wlr_output` which contain the value of these props. Also, a
`suggested_position` signal is added so that compositors can be notified
if there is a changed in the suggested position.
This commit is contained in:
Daniel Playfair Cal 2021-01-10 19:04:58 +11:00
parent a055f23b3b
commit 82f92113fd
6 changed files with 66 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

48
backend/drm/drm.c
View file

@ -540,6 +540,30 @@ bool drm_connector_supports_vrr(struct wlr_drm_connector *conn) {
return true;
}
static int32_t drm_connector_get_suggested_x(struct wlr_drm_connector *conn) {
struct wlr_drm_backend *drm = conn->backend;
uint64_t suggested_x;
if (conn->props.suggested_x == 0 ||
!get_drm_prop(drm->fd, conn->id, conn->props.suggested_x, &suggested_x)) {
return -1;
}
return suggested_x;
}
static int32_t drm_connector_get_suggested_y(struct wlr_drm_connector *conn) {
struct wlr_drm_backend *drm = conn->backend;
uint64_t suggested_y;
if (conn->props.suggested_y == 0 ||
!get_drm_prop(drm->fd, conn->id, conn->props.suggested_y, &suggested_y)) {
return -1;
}
return suggested_y;
}
static bool drm_connector_commit(struct wlr_output *output) {
struct wlr_drm_connector *conn = get_drm_connector_from_output(output);
struct wlr_drm_backend *drm = conn->backend;
@ -1315,6 +1339,25 @@ static bool update_modes(drmModeConnector *drm_conn,
return changes_made;
}
static bool update_suggested_position(struct wlr_drm_connector *wlr_conn) {
int32_t suggested_x = drm_connector_get_suggested_x(wlr_conn);
int32_t suggested_y = drm_connector_get_suggested_y(wlr_conn);
bool position_changed = false;
if (suggested_x != wlr_conn->output.suggested_x) {
position_changed = true;
wlr_conn->output.suggested_x = suggested_x;
}
if (suggested_y != wlr_conn->output.suggested_y) {
position_changed = true;
wlr_conn->output.suggested_y = suggested_y;
}
return position_changed;
}
void scan_drm_connectors(struct wlr_drm_backend *drm) {
/*
* This GPU is not really a modesetting device.
@ -1423,6 +1466,10 @@ void scan_drm_connectors(struct wlr_drm_backend *drm) {
if (update_modes(drm_conn, wlr_conn)) {
wlr_output_update_available_modes(&wlr_conn->output);
}
if (update_suggested_position(wlr_conn)) {
wlr_output_update_suggested_position(&wlr_conn->output);
}
}
if (wlr_conn->state == WLR_DRM_CONN_DISCONNECTED &&
@ -1458,6 +1505,7 @@ void scan_drm_connectors(struct wlr_drm_backend *drm) {
wlr_output_set_description(output, description);
update_modes(drm_conn, wlr_conn);
update_suggested_position(wlr_conn);
wlr_conn->possible_crtcs = get_possible_crtcs(drm->fd, res, drm_conn);
if (wlr_conn->possible_crtcs == 0) {

2
backend/drm/properties.c
View file

@ -25,6 +25,8 @@ static const struct prop_info connector_info[] = {
{ "PATH", INDEX(path) },
{ "link-status", INDEX(link_status) },
{ "vrr_capable", INDEX(vrr_capable) },
{ "suggested X", INDEX(suggested_x) },
{ "suggested Y", INDEX(suggested_y) },
#undef INDEX
};