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

compositor-drm: drm_output_apply_state_atomic heads

Browse Source 
Fix this function to support more than one head per output.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Acked-by: Derek Foreman <derekf@osg.samsung.com>
This commit is contained in:
Pekka Paalanen
2017-09-12 16:07:32 +03:00
parent 02aeb5c66e
commit 2f66130594
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libweston/compositor-drm.c
+6 -1
View File
@@ -2053,10 +2053,10 @@ drm_output_apply_state_atomic(struct drm_output_state *state,
uint32_t *flags) uint32_t *flags)
{ {
struct drm_output *output = state->output; struct drm_output *output = state->output;
struct drm_head *head = to_drm_head(weston_output_get_first_head(&output->base));
struct drm_backend *backend = to_drm_backend(output->base.compositor); struct drm_backend *backend = to_drm_backend(output->base.compositor);
struct drm_plane_state *plane_state; struct drm_plane_state *plane_state;
struct drm_mode *current_mode = to_drm_mode(output->base.current_mode); struct drm_mode *current_mode = to_drm_mode(output->base.current_mode);
struct drm_head *head;
int ret = 0; int ret = 0;
if (state->dpms != output->state_cur->dpms) if (state->dpms != output->state_cur->dpms)
@@ -2070,11 +2070,16 @@ drm_output_apply_state_atomic(struct drm_output_state *state,
ret |= crtc_add_prop(req, output, WDRM_CRTC_MODE_ID, ret |= crtc_add_prop(req, output, WDRM_CRTC_MODE_ID,
current_mode->blob_id); current_mode->blob_id);
ret |= crtc_add_prop(req, output, WDRM_CRTC_ACTIVE, 1); ret |= crtc_add_prop(req, output, WDRM_CRTC_ACTIVE, 1);
wl_list_for_each(head, &output->base.head_list, base.output_link) {
ret |= connector_add_prop(req, head, WDRM_CONNECTOR_CRTC_ID, ret |= connector_add_prop(req, head, WDRM_CONNECTOR_CRTC_ID,
output->crtc_id); output->crtc_id);
}
} else { } else {
ret |= crtc_add_prop(req, output, WDRM_CRTC_MODE_ID, 0); ret |= crtc_add_prop(req, output, WDRM_CRTC_MODE_ID, 0);
ret |= crtc_add_prop(req, output, WDRM_CRTC_ACTIVE, 0); ret |= crtc_add_prop(req, output, WDRM_CRTC_ACTIVE, 0);
wl_list_for_each(head, &output->base.head_list, base.output_link)
ret |= connector_add_prop(req, head, WDRM_CONNECTOR_CRTC_ID, 0); ret |= connector_add_prop(req, head, WDRM_CONNECTOR_CRTC_ID, 0);
} }