diff options
author | Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com> | 2012-12-14 13:37:28 -0200 |
---|---|---|
committer | Kristian Høgsberg <krh@bitplanet.net> | 2012-12-14 11:27:53 -0500 |
commit | f1c38a7426ba2bbb8bd9924d8980b38c1a6e4177 (patch) | |
tree | b70e605913b58628cb616798376109db49cccca5 | |
parent | 2e7a3ab7cd5e8339a5a269e7101ac180b174ae30 (diff) |
compositor-drm: Don't do a mode set on drm_output_switch_mode()
At this point, we reallocated the gbm surface, but we don't have an
fb with the right size to use. If we're going to a larger mode, the fb
would be too small and the mode set would fail. Besides, the repaint
logic will already do a mode set if necessary, so rely on that instead.
-rw-r--r-- | src/compositor-drm.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/compositor-drm.c b/src/compositor-drm.c index 22a3ac8..1aec473 100644 --- a/src/compositor-drm.c +++ b/src/compositor-drm.c @@ -1008,15 +1008,6 @@ drm_output_switch_mode(struct weston_output *output_base, struct weston_mode *mo goto err_gbm; } - ret = drmModeSetCrtc(ec->drm.fd, - output->crtc_id, - output->current->fb_id, 0, 0, - &output->connector_id, 1, &drm_mode->mode_info); - if (ret) { - weston_log("failed to set mode\n"); - goto err_gl; - } - /* reset rendering stuff. */ if (output->current) { if (output->current->is_client_buffer) @@ -1043,8 +1034,6 @@ drm_output_switch_mode(struct weston_output *output_base, struct weston_mode *mo output->base.current = &drm_mode->base; return 0; -err_gl: - gl_renderer_output_destroy(&output->base); err_gbm: gbm_surface_destroy(surface); return -1; |