commit 50ff0cb

Michael Forney  ·  2014-02-03 03:29:22 +0000 UTC
parent aa0b3f3 
framebuffer_plane: Use struct swc_mode instead of drmModeModeInfo
3 files changed,  +5, -7
M libswc/framebuffer_plane.c
M libswc/framebuffer_plane.h
M libswc/screen.c
M libswc/framebuffer_plane.c
+3, -3 
 1@@ -156,7 +156,7 @@ static void handle_page_flip(struct swc_drm_handler * handler, uint32_t time)
 2 }
 3 
 4 bool swc_framebuffer_plane_initialize(struct swc_framebuffer_plane * plane,
 5-                                      uint32_t crtc, drmModeModeInfoPtr mode,
 6+                                      uint32_t crtc, struct swc_mode * mode,
 7                                       uint32_t * connectors,
 8                                       uint32_t num_connectors)
 9 {
10@@ -182,7 +182,7 @@ bool swc_framebuffer_plane_initialize(struct swc_framebuffer_plane * plane,
11     memcpy(plane_connectors, connectors, num_connectors * sizeof connectors[0]);
12 
13     if (drmModeSetCrtc(swc.drm->fd, crtc, -1, 0, 0,
14-                       connectors, num_connectors, mode) != 0)
15+                       connectors, num_connectors, &mode->info) != 0)
16     {
17         ERROR("Failed to set CRTC: %s\n", strerror(errno));
18         goto error2;
19@@ -192,7 +192,7 @@ bool swc_framebuffer_plane_initialize(struct swc_framebuffer_plane * plane,
20     plane->drm_handler.page_flip = &handle_page_flip;
21     plane->need_modeset = true;
22     swc_view_initialize(&plane->view, &view_impl);
23-    swc_mode_initialize(&plane->mode, mode);
24+    plane->mode = *mode;
25 
26     return true;
27
M libswc/framebuffer_plane.h
+1, -3 
 1@@ -29,8 +29,6 @@
 2 #include "surface.h"
 3 #include "view.h"
 4 
 5-#include <xf86drmMode.h>
 6-
 7 struct swc_framebuffer_plane
 8 {
 9     uint32_t crtc;
10@@ -43,7 +41,7 @@ struct swc_framebuffer_plane
11 };
12 
13 bool swc_framebuffer_plane_initialize(struct swc_framebuffer_plane * plane,
14-                                      uint32_t crtc, drmModeModeInfoPtr mode,
15+                                      uint32_t crtc, struct swc_mode * mode,
16                                       uint32_t * connectors,
17                                       uint32_t num_connectors);
18
M libswc/screen.c
+1, -1 
1@@ -79,7 +79,7 @@ struct swc_screen_internal * swc_screen_new(uint32_t crtc,
2     wl_list_init(&screen->modifiers);
3 
4     if (!swc_framebuffer_plane_initialize(&screen->planes.framebuffer, crtc,
5-                                          &output->preferred_mode->info,
6+                                          output->preferred_mode,
7                                           &output->connector, 1))
8     {
9         ERROR("Failed to initialize framebuffer plane\n");