swc

commit 50ff0cb04aed72db5facf19a264608b13da26937
parent aa0b3f3498f8b1fd26a2730c34d0376539cb5b16
Author: Michael Forney <mforney@mforney.org>
Date:   Sun,  2 Feb 2014 19:29:22 -0800

framebuffer_plane: Use struct swc_mode instead of drmModeModeInfo

Diffstat:
M
libswc/framebuffer_plane.c
 | 
6
+++---
M
libswc/framebuffer_plane.h
 | 
4
+---
M
libswc/screen.c
 | 
2
+-

3 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/libswc/framebuffer_plane.c b/libswc/framebuffer_plane.c
@@ -156,7 +156,7 @@ static void handle_page_flip(struct swc_drm_handler * handler, uint32_t time)
 }
 
 bool swc_framebuffer_plane_initialize(struct swc_framebuffer_plane * plane,
-                                      uint32_t crtc, drmModeModeInfoPtr mode,
+                                      uint32_t crtc, struct swc_mode * mode,
                                       uint32_t * connectors,
                                       uint32_t num_connectors)
 {
@@ -182,7 +182,7 @@ bool swc_framebuffer_plane_initialize(struct swc_framebuffer_plane * plane,
     memcpy(plane_connectors, connectors, num_connectors * sizeof connectors[0]);
 
     if (drmModeSetCrtc(swc.drm->fd, crtc, -1, 0, 0,
-                       connectors, num_connectors, mode) != 0)
+                       connectors, num_connectors, &mode->info) != 0)
     {
         ERROR("Failed to set CRTC: %s\n", strerror(errno));
         goto error2;
@@ -192,7 +192,7 @@ bool swc_framebuffer_plane_initialize(struct swc_framebuffer_plane * plane,
     plane->drm_handler.page_flip = &handle_page_flip;
     plane->need_modeset = true;
     swc_view_initialize(&plane->view, &view_impl);
-    swc_mode_initialize(&plane->mode, mode);
+    plane->mode = *mode;
 
     return true;
 
diff --git a/libswc/framebuffer_plane.h b/libswc/framebuffer_plane.h
@@ -29,8 +29,6 @@
 #include "surface.h"
 #include "view.h"
 
-#include <xf86drmMode.h>
-
 struct swc_framebuffer_plane
 {
     uint32_t crtc;
@@ -43,7 +41,7 @@ struct swc_framebuffer_plane
 };
 
 bool swc_framebuffer_plane_initialize(struct swc_framebuffer_plane * plane,
-                                      uint32_t crtc, drmModeModeInfoPtr mode,
+                                      uint32_t crtc, struct swc_mode * mode,
                                       uint32_t * connectors,
                                       uint32_t num_connectors);
 
diff --git a/libswc/screen.c b/libswc/screen.c
@@ -79,7 +79,7 @@ struct swc_screen_internal * swc_screen_new(uint32_t crtc,
     wl_list_init(&screen->modifiers);
 
     if (!swc_framebuffer_plane_initialize(&screen->planes.framebuffer, crtc,
-                                          &output->preferred_mode->info,
+                                          output->preferred_mode,
                                           &output->connector, 1))
     {
         ERROR("Failed to initialize framebuffer plane\n");