diff options
| -rw-r--r-- | libweston/compositor-drm.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libweston/compositor-drm.c b/libweston/compositor-drm.c index a040b1e4..eb7a2666 100644 --- a/libweston/compositor-drm.c +++ b/libweston/compositor-drm.c @@ -224,7 +224,8 @@ struct drm_output { struct weston_view *cursor_view; int current_cursor; - struct weston_plane fb_plane; + /* Plane currently being directly displayed by KMS */ + struct weston_plane scanout_plane; struct drm_fb *fb_current, *fb_pending, *fb_last; struct backlight *backlight; @@ -622,7 +623,7 @@ drm_output_prepare_scanout_view(struct drm_output *output, drm_fb_set_buffer(output->fb_pending, buffer); - return &output->fb_plane; + return &output->scanout_plane; } static struct drm_fb * @@ -2644,10 +2645,10 @@ drm_output_enable(struct weston_output *base) weston_plane_init(&output->cursor_plane, b->compositor, INT32_MIN, INT32_MIN); - weston_plane_init(&output->fb_plane, b->compositor, 0, 0); + weston_plane_init(&output->scanout_plane, b->compositor, 0, 0); weston_compositor_stack_plane(b->compositor, &output->cursor_plane, NULL); - weston_compositor_stack_plane(b->compositor, &output->fb_plane, + weston_compositor_stack_plane(b->compositor, &output->scanout_plane, &b->compositor->primary_plane); weston_log("Output %s, (connector %d, crtc %d)\n", @@ -2681,7 +2682,7 @@ drm_output_deinit(struct weston_output *base) else drm_output_fini_egl(output); - weston_plane_release(&output->fb_plane); + weston_plane_release(&output->scanout_plane); weston_plane_release(&output->cursor_plane); drmModeFreeProperty(output->dpms_prop); |