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

compositor-openwfd: Expose all modes

Browse Source
This commit is contained in:
Benjamin Franzke
2011-06-24 13:01:03 +02:00
parent a16e002bd8
commit 259037d1d8
1 changed files with 67 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compositor/compositor-openwfd.c
+67 -20
View File
@@ -48,6 +48,11 @@ struct wfd_compositor {
uint32_t used_pipelines; uint32_t used_pipelines;
}; };
struct wfd_mode {
struct wlsc_mode base;
WFDPortMode mode;
};
struct wfd_output { struct wfd_output {
struct wlsc_output base; struct wlsc_output base;
@@ -63,8 +68,6 @@ struct wfd_output {
EGLImageKHR image[2]; EGLImageKHR image[2];
GLuint rbo[2]; GLuint rbo[2];
uint32_t current; uint32_t current;
struct wlsc_mode wl_mode;
}; };
static int static int
@@ -175,6 +178,30 @@ wfd_output_set_cursor(struct wlsc_output *output_base,
return -1; return -1;
} }
static int
wfd_output_add_mode(struct wfd_output *output, WFDPortMode mode)
{
struct wfd_compositor *ec =
(struct wfd_compositor *) output->base.compositor;
struct wfd_mode *wmode;
wmode = malloc(sizeof *wmode);
if (wmode == NULL)
return -1;
wmode->base.flags = 0;
wmode->base.width = wfdGetPortModeAttribi(ec->dev, output->port, mode,
WFD_PORT_MODE_WIDTH);
wmode->base.height = wfdGetPortModeAttribi(ec->dev, output->port, mode,
WFD_PORT_MODE_HEIGHT);
wmode->base.refresh = wfdGetPortModeAttribi(ec->dev, output->port, mode,
WFD_PORT_MODE_REFRESH_RATE);
wmode->mode = mode;
wl_list_insert(output->base.mode_list.prev, &wmode->base.link);
return 0;
}
static int static int
create_output_for_port(struct wfd_compositor *ec, create_output_for_port(struct wfd_compositor *ec,
WFDHandle port, WFDHandle port,
@@ -185,7 +212,10 @@ create_output_for_port(struct wfd_compositor *ec,
WFDint num_pipelines, *pipelines; WFDint num_pipelines, *pipelines;
WFDint num_modes; WFDint num_modes;
WFDint rect[4] = { 0, 0, 0, 0 }; WFDint rect[4] = { 0, 0, 0, 0 };
int width, height, refresh; int width, height;
WFDint native_resolution[2];
struct wfd_mode *mode;
WFDPortMode *modes;
output = malloc(sizeof *output); output = malloc(sizeof *output);
if (output == NULL) if (output == NULL)
@@ -194,34 +224,51 @@ create_output_for_port(struct wfd_compositor *ec,
memset(output, 0, sizeof *output); memset(output, 0, sizeof *output);
output->port = port; output->port = port;
wl_list_init(&output->base.mode_list);
wfdSetPortAttribi(ec->dev, output->port, wfdSetPortAttribi(ec->dev, output->port,
WFD_PORT_POWER_MODE, WFD_POWER_MODE_ON); WFD_PORT_POWER_MODE, WFD_POWER_MODE_ON);
num_modes = wfdGetPortModes(ec->dev, output->port, &output->mode, 1); num_modes = wfdGetPortModes(ec->dev, output->port, NULL, 0);
if (num_modes != 1) { if (num_modes < 1) {
fprintf(stderr, "failed to get port mode\n"); fprintf(stderr, "failed to get port mode\n");
goto cleanup_port; goto cleanup_port;
} }
width = wfdGetPortModeAttribi(ec->dev, output->port, output->mode, modes = malloc(sizeof(WFDPortMode) * num_modes);
WFD_PORT_MODE_WIDTH); if (modes == NULL)
height = wfdGetPortModeAttribi(ec->dev, output->port, output->mode, goto cleanup_port;
WFD_PORT_MODE_HEIGHT);
refresh = wfdGetPortModeAttribi(ec->dev, output->port, output->mode,
WFD_PORT_MODE_REFRESH_RATE);
output->wl_mode.flags = output->base.compositor = &ec->base;
WL_OUTPUT_MODE_CURRENT | WL_OUTPUT_MODE_PREFERRED; num_modes = wfdGetPortModes(ec->dev, output->port, modes, num_modes);
output->wl_mode.width = width; for (i = 0; i < num_modes; ++i)
output->wl_mode.height = height; wfd_output_add_mode(output, modes[i]);
output->wl_mode.refresh = refresh;
wl_list_init(&output->base.mode_list);
wl_list_insert(&output->base.mode_list, &output->wl_mode.link);
output->base.current = &output->wl_mode; free(modes);
wfdSetPortMode(ec->dev, output->port, output->mode); wfdGetPortAttribiv(ec->dev, output->port,
WFD_PORT_NATIVE_RESOLUTION,
2, native_resolution);
width = native_resolution[0];
height = native_resolution[1];
output->base.current = NULL;
wl_list_for_each(mode, &output->base.mode_list, base.link) {
if (mode->base.width == width && mode->base.height == height) {
output->base.current = &mode->base;
break;
}
}
if (output->base.current == NULL) {
fprintf(stderr, "failed to find a native mode\n");
goto cleanup_port;
}
mode = (struct wfd_mode *) output->base.current;
mode->base.flags = WL_OUTPUT_MODE_CURRENT | WL_OUTPUT_MODE_PREFERRED;
wfdSetPortMode(ec->dev, output->port, mode->mode);
wfdEnumeratePipelines(ec->dev, NULL, 0, NULL); wfdEnumeratePipelines(ec->dev, NULL, 0, NULL);