Merge branch 'modesetting-101' of git+ssh://git.freedesktop.org/git/mesa/drm into origin/modesetting-101

1 files changed, 6 insertions, 13 deletions

diff --git a/libdrm/xf86drmMode.h b/libdrm/xf86drmMode.h
index cdc82f7d..6aa104a9 100644
--- a/libdrm/xf86drmMode.h
+++ b/libdrm/xf86drmMode.h
@@ -76,18 +76,11 @@ typedef struct _drmModeRes {
 
 } drmModeRes, *drmModeResPtr;
 
-typedef struct _drmModeFrameBuffer {
-
-	uint32_t width;
-	uint32_t height;
-	uint32_t pitch;
-	uint8_t bpp;
-
-} drmModeFrameBuffer, *drmModeFrameBufferPtr;
+typedef struct drm_mode_fb_cmd drmModeFB, *drmModeFBPtr;
 
 typedef struct _drmModeCrtc {
 
-	unsigned int bufferId; /**< Buffer currently connected to */
+	unsigned int buffer_id; /**< FB id to connect to 0 = disconnect*/
 
 	uint32_t x, y; /**< Position on the frameuffer */
 	uint32_t width, height;
@@ -187,7 +180,7 @@ typedef struct _drmModeOutput {
 
 extern void drmModeFreeModeInfo( struct drm_mode_modeinfo *ptr );
 extern void drmModeFreeResources( drmModeResPtr ptr );
-extern void drmModeFreeFrameBuffer( drmModeFrameBufferPtr ptr );
+extern void drmModeFreeFB( drmModeFBPtr ptr );
 extern void drmModeFreeCrtc( drmModeCrtcPtr ptr );
 extern void drmModeFreeOutput( drmModeOutputPtr ptr );
 
@@ -209,14 +202,14 @@ extern int drmModeForceProbe(int fd, uint32_t outputId);
 /**
  * Retrive information about framebuffer bufferId
  */
-extern drmModeFrameBufferPtr drmModeGetFB(int fd,
-		uint32_t bufferId);
+extern drmModeFBPtr drmModeGetFB(int fd, uint32_t bufferId);
 
 /**
  * Creates a new framebuffer with an buffer object as its scanout buffer.
  */
 extern int drmModeAddFB(int fd, uint32_t width, uint32_t height, uint8_t depth,
-			uint8_t bpp, uint32_t pitch, drmBO *bo, uint32_t *buf_id);
+			uint8_t bpp, uint32_t pitch, drmBO *bo,
+			uint32_t *buf_id);
 /**
  * Destroies the given framebuffer.
  */