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

backend/drm: remove drm_connector_set_custom_mode 

Replace it with a function that returns the pending mode.
This commit is contained in:
Simon Ser 2020-05-18 11:42:57 +02:00 committed by Drew DeVault
parent 21c6cc5e4c
commit c02e9c2bb1
1 changed files with 25 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
backend/drm/drm.c
View File

@ -441,6 +441,24 @@ static bool drm_connector_test(struct wlr_output *output) {
return true; return true;
} }
static struct wlr_output_mode *drm_connector_get_pending_mode(
struct wlr_drm_connector *conn) {
struct wlr_output *output = &conn->output;
switch (output->pending.mode_type) {
case WLR_OUTPUT_STATE_MODE_FIXED:
return output->pending.mode;
case WLR_OUTPUT_STATE_MODE_CUSTOM:;
drmModeModeInfo mode = {0};
generate_cvt_mode(&mode, output->pending.custom_mode.width,
output->pending.custom_mode.height,
(float)output->pending.custom_mode.refresh / 1000, false, false);
mode.type = DRM_MODE_TYPE_USERDEF;
return wlr_drm_connector_add_mode(output, &mode);
}
abort();
}
static bool drm_connector_commit_buffer(struct wlr_output *output) { static bool drm_connector_commit_buffer(struct wlr_output *output) {
struct wlr_drm_connector *conn = get_drm_connector_from_output(output); struct wlr_drm_connector *conn = get_drm_connector_from_output(output);
struct wlr_drm_backend *drm = get_drm_backend_from_backend(output->backend); struct wlr_drm_backend *drm = get_drm_backend_from_backend(output->backend);
@ -516,10 +534,8 @@ static void drm_connector_enable_adaptive_sync(struct wlr_output *output,
enabled ? "enabled" : "disabled", output->name); enabled ? "enabled" : "disabled", output->name);
} }
static bool drm_connector_set_custom_mode(struct wlr_output *output,
int32_t width, int32_t height, int32_t refresh);
static bool drm_connector_commit(struct wlr_output *output) { 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 = get_drm_backend_from_backend(output->backend); struct wlr_drm_backend *drm = get_drm_backend_from_backend(output->backend);
if (!drm_connector_test(output)) { if (!drm_connector_test(output)) {
@ -531,20 +547,12 @@ static bool drm_connector_commit(struct wlr_output *output) {
} }
if (output->pending.committed & WLR_OUTPUT_STATE_MODE) { if (output->pending.committed & WLR_OUTPUT_STATE_MODE) {
switch (output->pending.mode_type) { struct wlr_output_mode *wlr_mode = drm_connector_get_pending_mode(conn);
case WLR_OUTPUT_STATE_MODE_FIXED: if (wlr_mode == NULL) {
if (!drm_connector_set_mode(output, output->pending.mode)) { return false;
return false; }
} if (!drm_connector_set_mode(output, wlr_mode)) {
break; return false;
case WLR_OUTPUT_STATE_MODE_CUSTOM:
if (!drm_connector_set_custom_mode(output,
output->pending.custom_mode.width,
output->pending.custom_mode.height,
output->pending.custom_mode.refresh)) {
return false;
}
break;
} }
} else if (output->pending.committed & WLR_OUTPUT_STATE_ENABLED) { } else if (output->pending.committed & WLR_OUTPUT_STATE_ENABLED) {
if (!enable_drm_connector(output, output->pending.enabled)) { if (!enable_drm_connector(output, output->pending.enabled)) {
@ -837,20 +845,6 @@ bool drm_connector_set_mode(struct wlr_output *output,
return true; return true;
} }
static bool drm_connector_set_custom_mode(struct wlr_output *output,
int32_t width, int32_t height, int32_t refresh) {
drmModeModeInfo mode = {0};
generate_cvt_mode(&mode, width, height, (float)refresh / 1000, false, false);
mode.type = DRM_MODE_TYPE_USERDEF;
struct wlr_output_mode *wlr_mode = wlr_drm_connector_add_mode(output, &mode);
if (wlr_mode == NULL) {
return false;
}
return drm_connector_set_mode(output, wlr_mode);
}
struct wlr_output_mode *wlr_drm_connector_add_mode(struct wlr_output *output, struct wlr_output_mode *wlr_drm_connector_add_mode(struct wlr_output *output,
const drmModeModeInfo *modeinfo) { const drmModeModeInfo *modeinfo) {
struct wlr_drm_connector *conn = get_drm_connector_from_output(output); struct wlr_drm_connector *conn = get_drm_connector_from_output(output);