|
|
|
@ -1221,10 +1221,10 @@ choose_mode (struct drm_output *output, struct weston_mode *target_mode) |
|
|
|
|
wl_list_for_each(mode, &output->base.mode_list, base.link) { |
|
|
|
|
if (mode->mode_info.hdisplay == target_mode->width && |
|
|
|
|
mode->mode_info.vdisplay == target_mode->height) { |
|
|
|
|
if (mode->mode_info.vrefresh == target_mode->refresh ||
|
|
|
|
|
if (mode->mode_info.vrefresh == target_mode->refresh || |
|
|
|
|
target_mode->refresh == 0) { |
|
|
|
|
return mode; |
|
|
|
|
} else if (!tmp_mode)
|
|
|
|
|
} else if (!tmp_mode) |
|
|
|
|
tmp_mode = mode; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
@ -2415,7 +2415,7 @@ update_outputs(struct drm_compositor *ec, struct udev_device *drm_device) |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/* FIXME: handle zero outputs, without terminating */
|
|
|
|
|
/* FIXME: handle zero outputs, without terminating */ |
|
|
|
|
if (ec->connector_allocator == 0) |
|
|
|
|
wl_display_terminate(ec->base.wl_display); |
|
|
|
|
} |
|
|
|
@ -2509,7 +2509,7 @@ drm_compositor_set_modes(struct drm_compositor *compositor) |
|
|
|
|
if (ret < 0) { |
|
|
|
|
weston_log( |
|
|
|
|
"failed to set mode %dx%d for output at %d,%d: %m\n", |
|
|
|
|
drm_mode->base.width, drm_mode->base.height,
|
|
|
|
|
drm_mode->base.width, drm_mode->base.height, |
|
|
|
|
output->base.x, output->base.y); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|