mirrors/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

compositor-drm: Return the newly added mode in drm_output_add_mode()

Browse Source 
Most of the times the caller will look at the output's mode list to get
the new mode, so just return that instead.
This commit is contained in:
Ander Conselvan de Oliveira 2012-08-09 16:45:00 +03:00 committed by Kristian Høgsberg
parent dc79e6d289
commit 42c46466ab
1 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/compositor-drm.c
View File

@ -1120,7 +1120,7 @@ init_egl(struct drm_compositor *ec, struct udev_device *device)
return 0; return 0;
} }
static int static struct drm_mode *
drm_output_add_mode(struct drm_output *output, drmModeModeInfo *info) drm_output_add_mode(struct drm_output *output, drmModeModeInfo *info)
{ {
struct drm_mode *mode; struct drm_mode *mode;
@ -1128,7 +1128,7 @@ drm_output_add_mode(struct drm_output *output, drmModeModeInfo *info)
mode = malloc(sizeof *mode); mode = malloc(sizeof *mode);
if (mode == NULL) if (mode == NULL)
return -1; return NULL;
mode->base.flags = 0; mode->base.flags = 0;
mode->base.width = info->hdisplay; mode->base.width = info->hdisplay;
@ -1153,7 +1153,7 @@ drm_output_add_mode(struct drm_output *output, drmModeModeInfo *info)
wl_list_insert(output->base.mode_list.prev, &mode->base.link); wl_list_insert(output->base.mode_list.prev, &mode->base.link);
return 0; return mode;
} }
static int static int
@ -1335,13 +1335,13 @@ create_output_for_connector(struct drm_compositor *ec,
int x, int y, struct udev_device *drm_device) int x, int y, struct udev_device *drm_device)
{ {
struct drm_output *output; struct drm_output *output;
struct drm_mode *drm_mode, *next; struct drm_mode *drm_mode, *next, *preferred, *current, *configured;
struct weston_mode *m, *preferred, *current, *configured; struct weston_mode *m;
struct drm_configured_output *o = NULL, *temp; struct drm_configured_output *o = NULL, *temp;
drmModeEncoder *encoder; drmModeEncoder *encoder;
drmModeModeInfo crtc_mode; drmModeModeInfo crtc_mode;
drmModeCrtc *crtc; drmModeCrtc *crtc;
int i, ret; int i;
char name[32]; char name[32];
const char *type_name; const char *type_name;
@ -1391,8 +1391,8 @@ create_output_for_connector(struct drm_compositor *ec,
} }
for (i = 0; i < connector->count_modes; i++) { for (i = 0; i < connector->count_modes; i++) {
ret = drm_output_add_mode(output, &connector->modes[i]); drm_mode = drm_output_add_mode(output, &connector->modes[i]);
if (ret) if (!drm_mode)
goto err_free; goto err_free;
} }
@ -1421,41 +1421,37 @@ create_output_for_connector(struct drm_compositor *ec,
if (o && o->width == drm_mode->base.width && if (o && o->width == drm_mode->base.width &&
o->height == drm_mode->base.height && o->height == drm_mode->base.height &&
o->config == OUTPUT_CONFIG_MODE) o->config == OUTPUT_CONFIG_MODE)
configured = &drm_mode->base; configured = drm_mode;
if (!memcmp(&crtc_mode, &drm_mode->mode_info, sizeof crtc_mode)) if (!memcmp(&crtc_mode, &drm_mode->mode_info, sizeof crtc_mode))
current = &drm_mode->base; current = drm_mode;
if (drm_mode->base.flags & WL_OUTPUT_MODE_PREFERRED) if (drm_mode->base.flags & WL_OUTPUT_MODE_PREFERRED)
preferred = &drm_mode->base; preferred = drm_mode;
} }
if (o && o->config == OUTPUT_CONFIG_MODELINE) { if (o && o->config == OUTPUT_CONFIG_MODELINE) {
ret = drm_output_add_mode(output, &o->crtc_mode); configured = drm_output_add_mode(output, &o->crtc_mode);
if (ret) if (!configured)
goto err_free; goto err_free;
configured = container_of(output->base.mode_list.prev,
struct weston_mode, link);
current = configured; current = configured;
} }
if (current == NULL && crtc_mode.clock != 0) { if (current == NULL && crtc_mode.clock != 0) {
ret = drm_output_add_mode(output, &crtc_mode); current = drm_output_add_mode(output, &crtc_mode);
if (ret) if (!current)
goto err_free; goto err_free;
current = container_of(output->base.mode_list.prev,
struct weston_mode, link);
} }
if (o && o->config == OUTPUT_CONFIG_CURRENT) if (o && o->config == OUTPUT_CONFIG_CURRENT)
configured = current; configured = current;
if (option_current_mode && current) if (option_current_mode && current)
output->base.current = current; output->base.current = &current->base;
else if (configured) else if (configured)
output->base.current = configured; output->base.current = &configured->base;
else if (preferred) else if (preferred)
output->base.current = preferred; output->base.current = &preferred->base;
else if (current) else if (current)
output->base.current = current; output->base.current = &current->base;
if (output->base.current == NULL) { if (output->base.current == NULL) {
weston_log("no available modes for %s\n", output->name); weston_log("no available modes for %s\n", output->name);