From 7bb112fecadc6fe42e5828b861600691071ccd91 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@linux.ie>
Date: Thu, 5 Apr 2007 17:06:42 +1000
Subject: checkpoint commit: added getresources, crtc and output

This adds the user interfaces from Jakob and hooks them up for 3 ioctls
GetResources, GetCrtc and GetOutput.

I've made the ids for everything fbs, crtcs, outputs and modes go via idr as
per krh's suggestion on irc as it make the code nice and consistent.
---
 libdrm/xf86drmMode.h | 290 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 290 insertions(+)
 create mode 100644 libdrm/xf86drmMode.h

(limited to 'libdrm/xf86drmMode.h')

diff --git a/libdrm/xf86drmMode.h b/libdrm/xf86drmMode.h
new file mode 100644
index 00000000..c027a16d
--- /dev/null
+++ b/libdrm/xf86drmMode.h
@@ -0,0 +1,290 @@
+/*
+ * \file xf86drmMode.h
+ * Header for DRM modesetting interface.
+ *
+ * \author Jakob Bornecrantz <wallbraker@gmail.com>
+ *
+ * \par Acknowledgements:
+ * Feb 2007, Dave Airlie <airlied@linux.ie>
+ */
+
+/*
+ * Copyright (c) <year> <copyright holders>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ *
+ */
+
+#include <drm.h>
+#include "xf86mm.h"
+
+/*
+ * This is the interface for modesetting for drm.
+ *
+ * In order to use this interface you must include either <stdint.h> or another
+ * header defining uint32_t, int32_t and uint16_t.
+ *
+ * It aims to provide a randr compatible interface for modesettings in the
+ * kernel, the interface is also ment to be used by libraries like EGL.
+ *
+ * More information can be found in randrproto.txt which can be found here:
+ * http://gitweb.freedesktop.org/?p=xorg/proto/randrproto.git
+ *
+ * All framebuffer, crtc and output ids start at 1 while 0 is either an invalid
+ * parameter or used to indicate that the command should disconnect from the
+ * currently bound target, as with drmModeMapOutput.
+ *
+ * Currently only one framebuffer exist and has a id of 1, which is also the
+ * default framebuffer and should allways be avaible to the client, unless
+ * it is locked/used or any other limiting state is applied on it.
+ *
+ */
+
+typedef struct _drmModeGammaTriple {
+	uint16_t r, g, b;
+} drmModeGammaTriple, *drmModeGammaTriplePtr;
+
+typedef struct _drmModeRes {
+
+	uint32_t frameBufferId;
+
+	int count_crtcs;
+	uint32_t *crtcs;
+
+	int count_outputs;
+	uint32_t *outputs;
+
+	int count_modes;
+	struct drm_mode_modeinfo *modes;
+
+} drmModeRes, *drmModeResPtr;
+
+typedef struct _drmModeFrameBuffer {
+
+	uint32_t minWidth, maxWidth;
+	uint32_t minHeight, maxHeight;
+
+} drmModeFrameBuffer, *drmModeFrameBufferPtr;
+
+typedef struct _drmModeCrtc {
+
+	unsigned int bufferId; /**< Buffer currently connected to */
+
+	uint32_t x, y; /**< Position on the frameuffer */
+	uint32_t width, height;
+	uint32_t mode; /**< Current mode used */
+
+	int count_outputs;
+	uint32_t outputs; /**< Outputs that are connected */
+
+	int count_possibles;
+	uint32_t possibles; /**< Outputs that can be connected */
+
+	int gamma_size; /**< Number of gamma stops */
+
+} drmModeCrtc, *drmModeCrtcPtr;
+
+typedef enum {
+	DRM_MODE_CONNECTED         = 1,
+	DRM_MODE_DISCONNECTED      = 2,
+	DRM_MODE_UNKNOWNCONNECTION = 3
+} drmModeConnection;
+
+typedef enum {
+	DRM_MODE_SUBPIXEL_UNKNOWN        = 1,
+	DRM_MODE_SUBPIXEL_HORIZONTAL_RGB = 2,
+	DRM_MODE_SUBPIXEL_HORIZONTAL_BGR = 3,
+	DRM_MODE_SUBPIXEL_VERTICAL_RGB   = 4,
+	DRM_MODE_SUBPIXEL_VERTICAL_BGR   = 5,
+	DRM_MODE_SUBPIXEL_NONE           = 6
+} drmModeSubPixel;
+
+typedef struct _drmModeOutput {
+
+	unsigned int crtc; /**< Crtc currently connected to */
+
+	drmModeConnection connection;
+	uint32_t mmWidth, mmHeight; /**< HxW in millimeters */
+	drmModeSubPixel subpixel;
+
+	int count_crtcs;
+	uint32_t crtcs; /**< Possible crtc to connect to */
+
+	int count_clones;
+	uint32_t clones; /**< Mask of clones */
+
+	int count_modes;
+	uint32_t *modes; /**< List of modes ids */
+
+} drmModeOutput, *drmModeOutputPtr;
+
+/*
+ * RRSetScreenConfig o
+ * RRGetScreenInfo o
+ *
+ * RRGetScreenSizeRange - see frameBuffer info
+ * RRSetScreenSize
+ * RRGetScreenResources
+ *
+ * RRGetOutputInfo
+ *
+ * RRListOutputProperties *
+ * RRQueryOutputProperty *
+ * RRConfigureOutputProperty *
+ * RRChangeOutputProperty *
+ * RRDeleteOutputProperty *
+ * RRGetOutputProperty *
+ *
+ * RRCreateMode
+ * RRDestroyMode
+ * RRAddOutputMode
+ * RRDeleteOutputMode
+ *
+ * RRGetCrtcInfo
+ * RRSetCrtcConfig
+ *
+ * RRGetCrtcGammaSize - see crtc info
+ * RRGetCrtcGamma
+ * RRSetCrtcGamma
+ *
+ * drmModeGetResources
+ * drmModeForceProbe
+ *
+ * drmModeGetFrameBufferInfo
+ * drmModeSetFrameBufferSize
+ *
+ * drmModeGetCrtcInfo
+ * drmModeSetCrtcConfig
+ * drmModeGetCrtcGamma
+ * drmModeSetCrtcGamma
+ *
+ * drmModeGetOutputInfo
+ *
+ * drmModeAddMode
+ * drmModeDestroyMode
+ * drmModeAddOutputMode
+ * drmModeDeleteOutputMode
+ */
+
+extern void drmModeFreeModeInfo( struct drm_mode_modeinfo *ptr );
+extern void drmModeFreeResources( drmModeResPtr ptr );
+extern void drmModeFreeFrameBuffer( drmModeFrameBufferPtr ptr );
+extern void drmModeFreeCrtc( drmModeCrtcPtr ptr );
+extern void drmModeFreeOutput( drmModeOutputPtr ptr );
+
+/**
+ * Retrives all of the resources associated with a card.
+ */
+extern drmModeResPtr drmModeGetResources(int fd);
+
+/**
+ * Forces a probe of the give output outputId, on 0 all will be probed.
+ */
+extern int drmModeForceProbe(int fd, uint32_t outputId);
+
+
+/*
+ * FrameBuffer manipulation.
+ */
+
+/**
+ * Retrive information about framebuffer bufferId
+ */
+extern drmModeFrameBufferPtr drmModeGetFramebuffer(int fd,
+		uint32_t bufferId);
+
+/**
+ * Creates a new framebuffer with an buffer object as its scanout buffer.
+ */
+extern uint32_t drmModeNewFrameBuffer(int fd,
+		uint32_t width, uint32_t height,
+		uint8_t bbp, uint32_t pitch, drmBO *bo);
+
+/**
+ * Destroies the given framebuffer.
+ */
+extern int drmModeDesFrameBuffer(int fd, uint32_t bufferId);
+
+/**
+ * Changes the scanout buffer to the given buffer object.
+ */
+extern int drmModeFlipFrameBuffer(int fd, uint32_t bufferId, drmBO *bo);
+
+/*
+ * Crtc function.
+ */
+
+/**
+ * Retrive information about the ctrt crtcId
+ */
+extern drmModeCrtcPtr drmModeGetCrtc(int fd, uint32_t crtcId);
+
+/**
+ * Set the mode on a crtc crtcId with the given mode modeId.
+ */
+extern int drmModeSetCrtc(int fd, uint32_t crtcId, uint32_t bufferId,
+		uint32_t x, uint32_t y, uint32_t modeId,
+		uint32_t *outputs, int count);
+
+/**
+ * Gets the gamma from a crtc
+ */
+extern drmModeGammaTriplePtr drmModeGetCrtcGamma(int fd, uint32_t crtcId,
+		int *count);
+
+/**
+ * Sets the gamma on a crtc
+ */
+extern int drmModeSetCrtcGamma(int fd, uint32_t crtcId,
+		drmModeGammaTriplePtr ptr, int count);
+
+
+
+/*
+ * Output manipulation
+ */
+
+/**
+ * Retrive information about the output outputId.
+ */
+extern drmModeOutputPtr drmModeGetOutput(int fd,
+		uint32_t outputId);
+
+/**
+ * Creates a new mode from the given mode info.
+ * Name must be unique.
+ */
+extern uint32_t drmModeNewMode(int fd, struct drm_mode_modeinfo *modeInfo);
+
+/**
+ * Destroys a mode created with CreateMode, must be unused.
+ */
+extern int drmModeDesMode(int fd, uint32_t modeId);
+
+/**
+ * Adds the given mode to an output.
+ */
+extern int drmModeAddMode(int fd, uint32_t outputId, uint32_t modeId);
+
+/**
+ * Deletes a mode Added with AddOutputMode from the output,
+ * must be unused, by the given mode.
+ */
+extern int drmModeDelMode(int fd, uint32_t outputId, uint32_t modeId);
+
-- 
cgit v1.2.3


From b50bda002b824efb24e18e8d514ff0ca763c15b9 Mon Sep 17 00:00:00 2001
From: Jakob Bornecrantz <wallbraker@gmail.com>
Date: Tue, 10 Apr 2007 18:44:47 +1000
Subject: add addfb/rmfb ioctls

Originally from Jakob, cleaned up by airlied.
---
 libdrm/xf86drmMode.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'libdrm/xf86drmMode.h')

diff --git a/libdrm/xf86drmMode.h b/libdrm/xf86drmMode.h
index c027a16d..45b157a8 100644
--- a/libdrm/xf86drmMode.h
+++ b/libdrm/xf86drmMode.h
@@ -77,8 +77,10 @@ typedef struct _drmModeRes {
 
 typedef struct _drmModeFrameBuffer {
 
-	uint32_t minWidth, maxWidth;
-	uint32_t minHeight, maxHeight;
+        uint32_t width;
+        uint32_t height;
+        uint32_t pitch;
+        uint8_t bpp;
 
 } drmModeFrameBuffer, *drmModeFrameBufferPtr;
 
-- 
cgit v1.2.3


From 65f465ed5ad3caf773658bb2832785c963b987f6 Mon Sep 17 00:00:00 2001
From: David Airlie <airlied@asimov.stargames.com.au>
Date: Tue, 10 Apr 2007 14:49:49 +1000
Subject: fixup numerous issues with adding framebuffer support

This still isn't perfect but it fixes a few oopses and cleans up
some of the tabs and bugs in the original fb limit code
---
 libdrm/xf86drmMode.h | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'libdrm/xf86drmMode.h')

diff --git a/libdrm/xf86drmMode.h b/libdrm/xf86drmMode.h
index 45b157a8..fadfdc5d 100644
--- a/libdrm/xf86drmMode.h
+++ b/libdrm/xf86drmMode.h
@@ -214,14 +214,12 @@ extern drmModeFrameBufferPtr drmModeGetFramebuffer(int fd,
 /**
  * Creates a new framebuffer with an buffer object as its scanout buffer.
  */
-extern uint32_t drmModeNewFrameBuffer(int fd,
-		uint32_t width, uint32_t height,
-		uint8_t bbp, uint32_t pitch, drmBO *bo);
-
+extern int drmModeAddFB(int fd, uint32_t width, uint32_t height,
+                        uint8_t bpp, uint32_t pitch, drmBO *bo, uint32_t *buf_id);
 /**
  * Destroies the given framebuffer.
  */
-extern int drmModeDesFrameBuffer(int fd, uint32_t bufferId);
+extern int drmModeRmFB(int fd, uint32_t bufferId);
 
 /**
  * Changes the scanout buffer to the given buffer object.
-- 
cgit v1.2.3


From 1e39dc43230ba1827eedc29ab422464281ec3e1b Mon Sep 17 00:00:00 2001
From: David Airlie <airlied@asimov.stargames.com.au>
Date: Tue, 10 Apr 2007 16:25:31 +1000
Subject: export output name to userspace

---
 libdrm/xf86drmMode.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'libdrm/xf86drmMode.h')

diff --git a/libdrm/xf86drmMode.h b/libdrm/xf86drmMode.h
index fadfdc5d..594eb487 100644
--- a/libdrm/xf86drmMode.h
+++ b/libdrm/xf86drmMode.h
@@ -120,7 +120,7 @@ typedef enum {
 typedef struct _drmModeOutput {
 
 	unsigned int crtc; /**< Crtc currently connected to */
-
+	unsigned char name[DRM_OUTPUT_NAME_LEN];
 	drmModeConnection connection;
 	uint32_t mmWidth, mmHeight; /**< HxW in millimeters */
 	drmModeSubPixel subpixel;
-- 
cgit v1.2.3


From 44be9c9d5950d3b2ba4d5527189abec8dac0686f Mon Sep 17 00:00:00 2001
From: David Airlie <airlied@asimov.stargames.com.au>
Date: Wed, 11 Apr 2007 13:19:30 +1000
Subject: add an fb count + id get to the get resources code path

---
 libdrm/xf86drmMode.h | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'libdrm/xf86drmMode.h')

diff --git a/libdrm/xf86drmMode.h b/libdrm/xf86drmMode.h
index 594eb487..4ca9e407 100644
--- a/libdrm/xf86drmMode.h
+++ b/libdrm/xf86drmMode.h
@@ -62,7 +62,8 @@ typedef struct _drmModeGammaTriple {
 
 typedef struct _drmModeRes {
 
-	uint32_t frameBufferId;
+	int count_fbs;
+	uint32_t *fbs;
 
 	int count_crtcs;
 	uint32_t *crtcs;
@@ -77,10 +78,10 @@ typedef struct _drmModeRes {
 
 typedef struct _drmModeFrameBuffer {
 
-        uint32_t width;
-        uint32_t height;
-        uint32_t pitch;
-        uint8_t bpp;
+	uint32_t width;
+	uint32_t height;
+	uint32_t pitch;
+	uint8_t bpp;
 
 } drmModeFrameBuffer, *drmModeFrameBufferPtr;
 
@@ -208,14 +209,14 @@ extern int drmModeForceProbe(int fd, uint32_t outputId);
 /**
  * Retrive information about framebuffer bufferId
  */
-extern drmModeFrameBufferPtr drmModeGetFramebuffer(int fd,
+extern drmModeFrameBufferPtr 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 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.
  */
-- 
cgit v1.2.3


From a6cc6a778f8b2f86300a8ce87441d044fd67f930 Mon Sep 17 00:00:00 2001
From: David Airlie <airlied@asimov.stargames.com.au>
Date: Wed, 11 Apr 2007 17:13:45 +1000
Subject: add support for setting a framebuffer depth

---
 libdrm/xf86drmMode.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'libdrm/xf86drmMode.h')

diff --git a/libdrm/xf86drmMode.h b/libdrm/xf86drmMode.h
index 4ca9e407..cdc82f7d 100644
--- a/libdrm/xf86drmMode.h
+++ b/libdrm/xf86drmMode.h
@@ -215,7 +215,7 @@ extern drmModeFrameBufferPtr drmModeGetFB(int fd,
 /**
  * Creates a new framebuffer with an buffer object as its scanout buffer.
  */
-extern int drmModeAddFB(int fd, uint32_t width, uint32_t height,
+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);
 /**
  * Destroies the given framebuffer.
-- 
cgit v1.2.3


From a81558d8b3ee17fbf46e32b10732e22fcd997858 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@linux.ie>
Date: Thu, 12 Apr 2007 08:45:40 +1000
Subject: add getfb ioctl

---
 libdrm/xf86drmMode.h | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

(limited to 'libdrm/xf86drmMode.h')

diff --git a/libdrm/xf86drmMode.h b/libdrm/xf86drmMode.h
index cdc82f7d..6a566c4d 100644
--- a/libdrm/xf86drmMode.h
+++ b/libdrm/xf86drmMode.h
@@ -76,14 +76,7 @@ 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 drmModeFrameBuffer, *drmModeFrameBufferPtr;
 
 typedef struct _drmModeCrtc {
 
@@ -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 drmModeFrameBufferPtr 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.
  */
-- 
cgit v1.2.3


From 981f8156de0c5ec6387f659fbcac031d663d943c Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@linux.ie>
Date: Thu, 12 Apr 2007 08:54:31 +1000
Subject: allow framebuffer changes on the crtc setup

---
 libdrm/xf86drmMode.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'libdrm/xf86drmMode.h')

diff --git a/libdrm/xf86drmMode.h b/libdrm/xf86drmMode.h
index 6a566c4d..c87a95da 100644
--- a/libdrm/xf86drmMode.h
+++ b/libdrm/xf86drmMode.h
@@ -80,7 +80,7 @@ typedef struct drm_mode_fb_cmd drmModeFrameBuffer, *drmModeFrameBufferPtr;
 
 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;
-- 
cgit v1.2.3


From b1f0fd6dfbd1495aa08c6358e936582eeca042c8 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@linux.ie>
Date: Thu, 12 Apr 2007 12:11:58 +1000
Subject: use FB everywhere

---
 libdrm/xf86drmMode.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'libdrm/xf86drmMode.h')

diff --git a/libdrm/xf86drmMode.h b/libdrm/xf86drmMode.h
index c87a95da..6aa104a9 100644
--- a/libdrm/xf86drmMode.h
+++ b/libdrm/xf86drmMode.h
@@ -76,7 +76,7 @@ typedef struct _drmModeRes {
 
 } drmModeRes, *drmModeResPtr;
 
-typedef struct drm_mode_fb_cmd drmModeFrameBuffer, *drmModeFrameBufferPtr;
+typedef struct drm_mode_fb_cmd drmModeFB, *drmModeFBPtr;
 
 typedef struct _drmModeCrtc {
 
@@ -180,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 );
 
@@ -202,7 +202,7 @@ 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.
-- 
cgit v1.2.3


From 89231953d108e74ee7b0eb99494ead1dd795d640 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@linux.ie>
Date: Tue, 1 May 2007 13:16:29 +1000
Subject: Add support for user defined modes

This allows userspace to specify modes and add them to the modesetting
system and attach modes to outputs
---
 libdrm/xf86drmMode.h | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'libdrm/xf86drmMode.h')

diff --git a/libdrm/xf86drmMode.h b/libdrm/xf86drmMode.h
index 6aa104a9..60e919ae 100644
--- a/libdrm/xf86drmMode.h
+++ b/libdrm/xf86drmMode.h
@@ -261,24 +261,24 @@ extern drmModeOutputPtr drmModeGetOutput(int fd,
 		uint32_t outputId);
 
 /**
- * Creates a new mode from the given mode info.
+ * Adds a new mode from the given mode info.
  * Name must be unique.
  */
-extern uint32_t drmModeNewMode(int fd, struct drm_mode_modeinfo *modeInfo);
+extern uint32_t drmModeAddMode(int fd, struct drm_mode_modeinfo *modeInfo);
 
 /**
- * Destroys a mode created with CreateMode, must be unused.
+ * Removes a mode created with AddMode, must be unused.
  */
-extern int drmModeDesMode(int fd, uint32_t modeId);
+extern int drmModeRmMode(int fd, uint32_t modeId);
 
 /**
- * Adds the given mode to an output.
+ * Attaches the given mode to an output.
  */
-extern int drmModeAddMode(int fd, uint32_t outputId, uint32_t modeId);
+extern int drmModeAttachMode(int fd, uint32_t outputId, uint32_t modeId);
 
 /**
- * Deletes a mode Added with AddOutputMode from the output,
+ * Detaches a mode from the output
  * must be unused, by the given mode.
  */
-extern int drmModeDelMode(int fd, uint32_t outputId, uint32_t modeId);
+extern int drmModeDetachMode(int fd, uint32_t outputId, uint32_t modeId);
 
-- 
cgit v1.2.3


From 45e09ea3cf85b76c18fb92a593ca7c40681052a7 Mon Sep 17 00:00:00 2001
From: Jakob Bornecrantz <wallbraker@gmail.com>
Date: Sat, 5 May 2007 16:08:27 +0200
Subject: Cleaned up userspace interface for modesetting.

---
 libdrm/xf86drmMode.h | 88 ++++------------------------------------------------
 1 file changed, 6 insertions(+), 82 deletions(-)

(limited to 'libdrm/xf86drmMode.h')

diff --git a/libdrm/xf86drmMode.h b/libdrm/xf86drmMode.h
index 60e919ae..b25a6610 100644
--- a/libdrm/xf86drmMode.h
+++ b/libdrm/xf86drmMode.h
@@ -40,25 +40,17 @@
  * In order to use this interface you must include either <stdint.h> or another
  * header defining uint32_t, int32_t and uint16_t.
  *
- * It aims to provide a randr compatible interface for modesettings in the
+ * It aims to provide a randr1.2 compatible interface for modesettings in the
  * kernel, the interface is also ment to be used by libraries like EGL.
  *
  * More information can be found in randrproto.txt which can be found here:
  * http://gitweb.freedesktop.org/?p=xorg/proto/randrproto.git
  *
- * All framebuffer, crtc and output ids start at 1 while 0 is either an invalid
- * parameter or used to indicate that the command should disconnect from the
- * currently bound target, as with drmModeMapOutput.
- *
- * Currently only one framebuffer exist and has a id of 1, which is also the
- * default framebuffer and should allways be avaible to the client, unless
- * it is locked/used or any other limiting state is applied on it.
- *
+ * There are some major diffrences to be noted. Unlike the randr1.2 proto you
+ * need to create the memory object of the framebuffer yourself with the ttm
+ * buffer object interface. This object needs to be pinned.
  */
 
-typedef struct _drmModeGammaTriple {
-	uint16_t r, g, b;
-} drmModeGammaTriple, *drmModeGammaTriplePtr;
 
 typedef struct _drmModeRes {
 
@@ -130,53 +122,7 @@ typedef struct _drmModeOutput {
 
 } drmModeOutput, *drmModeOutputPtr;
 
-/*
- * RRSetScreenConfig o
- * RRGetScreenInfo o
- *
- * RRGetScreenSizeRange - see frameBuffer info
- * RRSetScreenSize
- * RRGetScreenResources
- *
- * RRGetOutputInfo
- *
- * RRListOutputProperties *
- * RRQueryOutputProperty *
- * RRConfigureOutputProperty *
- * RRChangeOutputProperty *
- * RRDeleteOutputProperty *
- * RRGetOutputProperty *
- *
- * RRCreateMode
- * RRDestroyMode
- * RRAddOutputMode
- * RRDeleteOutputMode
- *
- * RRGetCrtcInfo
- * RRSetCrtcConfig
- *
- * RRGetCrtcGammaSize - see crtc info
- * RRGetCrtcGamma
- * RRSetCrtcGamma
- *
- * drmModeGetResources
- * drmModeForceProbe
- *
- * drmModeGetFrameBufferInfo
- * drmModeSetFrameBufferSize
- *
- * drmModeGetCrtcInfo
- * drmModeSetCrtcConfig
- * drmModeGetCrtcGamma
- * drmModeSetCrtcGamma
- *
- * drmModeGetOutputInfo
- *
- * drmModeAddMode
- * drmModeDestroyMode
- * drmModeAddOutputMode
- * drmModeDeleteOutputMode
- */
+
 
 extern void drmModeFreeModeInfo( struct drm_mode_modeinfo *ptr );
 extern void drmModeFreeResources( drmModeResPtr ptr );
@@ -189,11 +135,6 @@ extern void drmModeFreeOutput( drmModeOutputPtr ptr );
  */
 extern drmModeResPtr drmModeGetResources(int fd);
 
-/**
- * Forces a probe of the give output outputId, on 0 all will be probed.
- */
-extern int drmModeForceProbe(int fd, uint32_t outputId);
-
 
 /*
  * FrameBuffer manipulation.
@@ -215,13 +156,9 @@ extern int drmModeAddFB(int fd, uint32_t width, uint32_t height, uint8_t depth,
  */
 extern int drmModeRmFB(int fd, uint32_t bufferId);
 
-/**
- * Changes the scanout buffer to the given buffer object.
- */
-extern int drmModeFlipFrameBuffer(int fd, uint32_t bufferId, drmBO *bo);
 
 /*
- * Crtc function.
+ * Crtc functions
  */
 
 /**
@@ -236,19 +173,6 @@ extern int drmModeSetCrtc(int fd, uint32_t crtcId, uint32_t bufferId,
 		uint32_t x, uint32_t y, uint32_t modeId,
 		uint32_t *outputs, int count);
 
-/**
- * Gets the gamma from a crtc
- */
-extern drmModeGammaTriplePtr drmModeGetCrtcGamma(int fd, uint32_t crtcId,
-		int *count);
-
-/**
- * Sets the gamma on a crtc
- */
-extern int drmModeSetCrtcGamma(int fd, uint32_t crtcId,
-		drmModeGammaTriplePtr ptr, int count);
-
-
 
 /*
  * Output manipulation
-- 
cgit v1.2.3


From f32688d3d011d631c18d584603d684edd9b9b512 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@linux.ie>
Date: Thu, 15 Nov 2007 18:31:50 +1100
Subject: libdrm: add crtc/output ids to userspace interface

---
 libdrm/xf86drmMode.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'libdrm/xf86drmMode.h')

diff --git a/libdrm/xf86drmMode.h b/libdrm/xf86drmMode.h
index b25a6610..be9d84af 100644
--- a/libdrm/xf86drmMode.h
+++ b/libdrm/xf86drmMode.h
@@ -71,7 +71,7 @@ typedef struct _drmModeRes {
 typedef struct drm_mode_fb_cmd drmModeFB, *drmModeFBPtr;
 
 typedef struct _drmModeCrtc {
-
+	unsigned int crtc_id;
 	unsigned int buffer_id; /**< FB id to connect to 0 = disconnect*/
 
 	uint32_t x, y; /**< Position on the frameuffer */
@@ -104,6 +104,7 @@ typedef enum {
 } drmModeSubPixel;
 
 typedef struct _drmModeOutput {
+	unsigned int output_id;
 
 	unsigned int crtc; /**< Crtc currently connected to */
 	unsigned char name[DRM_OUTPUT_NAME_LEN];
-- 
cgit v1.2.3


From b3af2b59a77a6916ea7151236d3da9bde6a537fc Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Tue, 27 Nov 2007 14:31:02 +1000
Subject: drm/modesetting: add initial gettable properites code.

This allow the user to retrieve a list of properties for an output.
Properties can either be 32-bit values or an enum with an associated name.
Range properties are to be supported.

This API is probably not all correct, I may make properties part of the general
resource get when I think about it some more.

So basically you can create properties and attached them to whatever outputs you want,
so it should be possible to create some generics and just attach them to every output.
---
 libdrm/xf86drmMode.h | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'libdrm/xf86drmMode.h')

diff --git a/libdrm/xf86drmMode.h b/libdrm/xf86drmMode.h
index be9d84af..5e966e95 100644
--- a/libdrm/xf86drmMode.h
+++ b/libdrm/xf86drmMode.h
@@ -70,6 +70,17 @@ typedef struct _drmModeRes {
 
 typedef struct drm_mode_fb_cmd drmModeFB, *drmModeFBPtr;
 
+typedef struct _drmModeProperty {
+	unsigned int prop_id;
+	unsigned int flags;
+	unsigned char name[DRM_PROP_NAME_LEN];
+	int count_values;
+	uint32_t *values;
+	int count_enums;
+	struct drm_mode_property_enum *enums;
+
+} drmModePropertyRes, *drmModePropertyPtr;
+
 typedef struct _drmModeCrtc {
 	unsigned int crtc_id;
 	unsigned int buffer_id; /**< FB id to connect to 0 = disconnect*/
@@ -121,6 +132,10 @@ typedef struct _drmModeOutput {
 	int count_modes;
 	uint32_t *modes; /**< List of modes ids */
 
+	int count_props;
+	uint32_t *props; /**< List of property ids */
+	uint32_t *prop_values; /**< List of property values */
+
 } drmModeOutput, *drmModeOutputPtr;
 
 
@@ -207,3 +222,5 @@ extern int drmModeAttachMode(int fd, uint32_t outputId, uint32_t modeId);
  */
 extern int drmModeDetachMode(int fd, uint32_t outputId, uint32_t modeId);
 
+extern drmModePropertyPtr drmModeGetProperty(int fd, uint32_t propertyId);
+extern void drmModeFreeProperty(drmModePropertyPtr ptr);
-- 
cgit v1.2.3


From 91cd3e3c097d581ea75ec4bcbc1ba8d23b471a2e Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Wed, 28 Nov 2007 15:18:25 +1000
Subject: modesetting API change for removing mode ids and making modes per
 output.

so really want to get a list of modes per output not the global hammer list.
also we remove the mode ids and let the user pass back the full mode description

need to fix up add/remove mode for user modes now
---
 libdrm/xf86drmMode.h | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'libdrm/xf86drmMode.h')

diff --git a/libdrm/xf86drmMode.h b/libdrm/xf86drmMode.h
index 5e966e95..0777c596 100644
--- a/libdrm/xf86drmMode.h
+++ b/libdrm/xf86drmMode.h
@@ -63,9 +63,6 @@ typedef struct _drmModeRes {
 	int count_outputs;
 	uint32_t *outputs;
 
-	int count_modes;
-	struct drm_mode_modeinfo *modes;
-
 } drmModeRes, *drmModeResPtr;
 
 typedef struct drm_mode_fb_cmd drmModeFB, *drmModeFBPtr;
@@ -87,7 +84,8 @@ typedef struct _drmModeCrtc {
 
 	uint32_t x, y; /**< Position on the frameuffer */
 	uint32_t width, height;
-	uint32_t mode; /**< Current mode used */
+	int mode_valid;
+	struct drm_mode_modeinfo mode;
 
 	int count_outputs;
 	uint32_t outputs; /**< Outputs that are connected */
@@ -130,7 +128,7 @@ typedef struct _drmModeOutput {
 	uint32_t clones; /**< Mask of clones */
 
 	int count_modes;
-	uint32_t *modes; /**< List of modes ids */
+	struct drm_mode_modeinfo *modes;
 
 	int count_props;
 	uint32_t *props; /**< List of property ids */
@@ -185,9 +183,9 @@ extern drmModeCrtcPtr drmModeGetCrtc(int fd, uint32_t crtcId);
 /**
  * Set the mode on a crtc crtcId with the given mode modeId.
  */
-extern int drmModeSetCrtc(int fd, uint32_t crtcId, uint32_t bufferId,
-		uint32_t x, uint32_t y, uint32_t modeId,
-		uint32_t *outputs, int count);
+int drmModeSetCrtc(int fd, uint32_t crtcId, uint32_t bufferId,
+                   uint32_t x, uint32_t y, uint32_t *outputs, int count,
+		   struct drm_mode_modeinfo *mode);
 
 
 /*
-- 
cgit v1.2.3


From 96df9b11ad8974d7a2a0a589114cbbb04a584f18 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Mon, 3 Dec 2007 13:42:32 +1000
Subject: finish of mode add/remove, just have attach/detach modes

---
 libdrm/xf86drmMode.h | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

(limited to 'libdrm/xf86drmMode.h')

diff --git a/libdrm/xf86drmMode.h b/libdrm/xf86drmMode.h
index 0777c596..a1d717f9 100644
--- a/libdrm/xf86drmMode.h
+++ b/libdrm/xf86drmMode.h
@@ -198,27 +198,16 @@ int drmModeSetCrtc(int fd, uint32_t crtcId, uint32_t bufferId,
 extern drmModeOutputPtr drmModeGetOutput(int fd,
 		uint32_t outputId);
 
-/**
- * Adds a new mode from the given mode info.
- * Name must be unique.
- */
-extern uint32_t drmModeAddMode(int fd, struct drm_mode_modeinfo *modeInfo);
-
-/**
- * Removes a mode created with AddMode, must be unused.
- */
-extern int drmModeRmMode(int fd, uint32_t modeId);
-
 /**
  * Attaches the given mode to an output.
  */
-extern int drmModeAttachMode(int fd, uint32_t outputId, uint32_t modeId);
+extern int drmModeAttachMode(int fd, uint32_t outputId, struct drm_mode_modeinfo *mode_info);
 
 /**
  * Detaches a mode from the output
  * must be unused, by the given mode.
  */
-extern int drmModeDetachMode(int fd, uint32_t outputId, uint32_t modeId);
+extern int drmModeDetachMode(int fd, uint32_t outputId, struct drm_mode_modeinfo *mode_info);
 
 extern drmModePropertyPtr drmModeGetProperty(int fd, uint32_t propertyId);
 extern void drmModeFreeProperty(drmModePropertyPtr ptr);
-- 
cgit v1.2.3


From 1a6c95ef711fce807659ab5e4fe480d65ac233b6 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Wed, 5 Dec 2007 16:03:05 +1000
Subject: arrgggh.. make all ioctl structs 32/64-bit compatible hopefully.

This also starts to add blob property support.

someone needs to check this work for other things like ppc/x86 alignment diffs
---
 libdrm/xf86drmMode.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'libdrm/xf86drmMode.h')

diff --git a/libdrm/xf86drmMode.h b/libdrm/xf86drmMode.h
index a1d717f9..ec77174b 100644
--- a/libdrm/xf86drmMode.h
+++ b/libdrm/xf86drmMode.h
@@ -63,6 +63,8 @@ typedef struct _drmModeRes {
 	int count_outputs;
 	uint32_t *outputs;
 
+	uint32_t min_width, max_width;
+	uint32_t min_height, max_height;
 } drmModeRes, *drmModeResPtr;
 
 typedef struct drm_mode_fb_cmd drmModeFB, *drmModeFBPtr;
@@ -72,7 +74,7 @@ typedef struct _drmModeProperty {
 	unsigned int flags;
 	unsigned char name[DRM_PROP_NAME_LEN];
 	int count_values;
-	uint32_t *values;
+	uint64_t *values;
 	int count_enums;
 	struct drm_mode_property_enum *enums;
 
@@ -132,7 +134,7 @@ typedef struct _drmModeOutput {
 
 	int count_props;
 	uint32_t *props; /**< List of property ids */
-	uint32_t *prop_values; /**< List of property values */
+	uint64_t *prop_values; /**< List of property values */
 
 } drmModeOutput, *drmModeOutputPtr;
 
-- 
cgit v1.2.3


From c9cda51af5a8bea1d30ce575ae260de52950fe2f Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Wed, 5 Dec 2007 16:31:35 +1000
Subject: more WIP on blobs..

I'm going to pass back a list of blob ids and lengths in the getproperty.
will need another ioctl to return the blob data as it is variable length.
---
 libdrm/xf86drmMode.h | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'libdrm/xf86drmMode.h')

diff --git a/libdrm/xf86drmMode.h b/libdrm/xf86drmMode.h
index ec77174b..e936044b 100644
--- a/libdrm/xf86drmMode.h
+++ b/libdrm/xf86drmMode.h
@@ -69,15 +69,22 @@ typedef struct _drmModeRes {
 
 typedef struct drm_mode_fb_cmd drmModeFB, *drmModeFBPtr;
 
+typedef struct _drmModePropertyBlob {
+	uint32_t id;
+	uint32_t length;
+	void *data;
+} drmModePropertyBlobRes, *drmModePropertyBlobPtr;
+
 typedef struct _drmModeProperty {
 	unsigned int prop_id;
 	unsigned int flags;
 	unsigned char name[DRM_PROP_NAME_LEN];
 	int count_values;
-	uint64_t *values;
+	uint64_t *values; // store the blob lengths
 	int count_enums;
 	struct drm_mode_property_enum *enums;
-
+	int count_blobs;
+	uint32_t *blob_ids; // store the blob IDs
 } drmModePropertyRes, *drmModePropertyPtr;
 
 typedef struct _drmModeCrtc {
-- 
cgit v1.2.3


From 67f6eb1eb8d3dc5bb5fdb097655d3da326f637c1 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Thu, 6 Dec 2007 10:44:51 +1000
Subject: add property blobs and edid reporting support

---
 libdrm/xf86drmMode.h | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'libdrm/xf86drmMode.h')

diff --git a/libdrm/xf86drmMode.h b/libdrm/xf86drmMode.h
index e936044b..6fcf6a19 100644
--- a/libdrm/xf86drmMode.h
+++ b/libdrm/xf86drmMode.h
@@ -220,3 +220,6 @@ extern int drmModeDetachMode(int fd, uint32_t outputId, struct drm_mode_modeinfo
 
 extern drmModePropertyPtr drmModeGetProperty(int fd, uint32_t propertyId);
 extern void drmModeFreeProperty(drmModePropertyPtr ptr);
+
+extern drmModePropertyBlobPtr drmModeGetPropertyBlob(int fd, uint32_t blob_id);
+extern void drmModeFreePropertyBlob(drmModePropertyBlobPtr ptr);
-- 
cgit v1.2.3


From f99dea7db00dd46aa96eaed3a61dff9c956fd86f Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Tue, 11 Dec 2007 15:56:48 +1000
Subject: modesetting: fixup property setting and add connector property

---
 libdrm/xf86drmMode.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'libdrm/xf86drmMode.h')

diff --git a/libdrm/xf86drmMode.h b/libdrm/xf86drmMode.h
index 6fcf6a19..05b61bc8 100644
--- a/libdrm/xf86drmMode.h
+++ b/libdrm/xf86drmMode.h
@@ -223,3 +223,5 @@ extern void drmModeFreeProperty(drmModePropertyPtr ptr);
 
 extern drmModePropertyBlobPtr drmModeGetPropertyBlob(int fd, uint32_t blob_id);
 extern void drmModeFreePropertyBlob(drmModePropertyBlobPtr ptr);
+extern int drmModeOutputSetProperty(int fd, uint32_t output_id, uint32_t property_id,
+				    uint64_t value);
-- 
cgit v1.2.3


From b13dc383df85d75cb1ea422f4d13efc2a4a8a732 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Tue, 18 Dec 2007 17:41:20 +1100
Subject: remove output names

---
 libdrm/xf86drmMode.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'libdrm/xf86drmMode.h')

diff --git a/libdrm/xf86drmMode.h b/libdrm/xf86drmMode.h
index 05b61bc8..e2dda8ac 100644
--- a/libdrm/xf86drmMode.h
+++ b/libdrm/xf86drmMode.h
@@ -125,7 +125,8 @@ typedef struct _drmModeOutput {
 	unsigned int output_id;
 
 	unsigned int crtc; /**< Crtc currently connected to */
-	unsigned char name[DRM_OUTPUT_NAME_LEN];
+	unsigned int output_type;
+	unsigned int output_type_id;
 	drmModeConnection connection;
 	uint32_t mmWidth, mmHeight; /**< HxW in millimeters */
 	drmModeSubPixel subpixel;
-- 
cgit v1.2.3


From a2254c5a9670a3e865f0eb5acd46e905c9b146ce Mon Sep 17 00:00:00 2001
From: Jakob Bornecrantz <jakob@tungstengraphics.com>
Date: Mon, 28 Jan 2008 03:12:29 +0100
Subject: Added cursor support

---
 libdrm/xf86drmMode.h | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'libdrm/xf86drmMode.h')

diff --git a/libdrm/xf86drmMode.h b/libdrm/xf86drmMode.h
index e2dda8ac..f5b3337c 100644
--- a/libdrm/xf86drmMode.h
+++ b/libdrm/xf86drmMode.h
@@ -197,6 +197,19 @@ int drmModeSetCrtc(int fd, uint32_t crtcId, uint32_t bufferId,
                    uint32_t x, uint32_t y, uint32_t *outputs, int count,
 		   struct drm_mode_modeinfo *mode);
 
+/*
+ * Cursor functions
+ */
+
+/**
+ * Set the cursor on crtc
+ */
+int drmModeSetCursor(int fd, uint32_t crtcId, drmBO *bo, uint32_t width, uint32_t height);
+
+/**
+ * Move the cursor on crtc
+ */
+int drmModeMoveCursor(int fd, uint32_t crtcId, int x, int y);
 
 /*
  * Output manipulation
-- 
cgit v1.2.3


From 5997e10ca75ac87fd54b3bc0035938e1a9ad7929 Mon Sep 17 00:00:00 2001
From: Alan Hourihane <alanh@tungstengraphics.com>
Date: Tue, 5 Feb 2008 15:15:13 +0000
Subject: consistency

---
 libdrm/xf86drmMode.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'libdrm/xf86drmMode.h')

diff --git a/libdrm/xf86drmMode.h b/libdrm/xf86drmMode.h
index f5b3337c..e878c40a 100644
--- a/libdrm/xf86drmMode.h
+++ b/libdrm/xf86drmMode.h
@@ -78,7 +78,7 @@ typedef struct _drmModePropertyBlob {
 typedef struct _drmModeProperty {
 	unsigned int prop_id;
 	unsigned int flags;
-	unsigned char name[DRM_PROP_NAME_LEN];
+	char name[DRM_PROP_NAME_LEN];
 	int count_values;
 	uint64_t *values; // store the blob lengths
 	int count_enums;
-- 
cgit v1.2.3


From c8b45e9362aa16fed08540996af6d0b1e2e730d0 Mon Sep 17 00:00:00 2001
From: Jakob Bornecrantz <jakob@tungstengraphics.com>
Date: Thu, 7 Feb 2008 19:25:52 +0100
Subject: Added userspace part of hotplug ioctl and demo

---
 libdrm/xf86drmMode.h | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'libdrm/xf86drmMode.h')

diff --git a/libdrm/xf86drmMode.h b/libdrm/xf86drmMode.h
index e878c40a..7cc3ceca 100644
--- a/libdrm/xf86drmMode.h
+++ b/libdrm/xf86drmMode.h
@@ -159,6 +159,10 @@ extern void drmModeFreeOutput( drmModeOutputPtr ptr );
  */
 extern drmModeResPtr drmModeGetResources(int fd);
 
+/**
+ * Retrives the hotplug counter
+ */
+extern uint32_t drmModeGetHotplug(int fd);
 
 /*
  * FrameBuffer manipulation.
-- 
cgit v1.2.3


From 132ba667f4a88bb182e2d2abc7c4e60699398380 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Thu, 28 Feb 2008 12:59:39 +1000
Subject: drm: add a check for if modesetting is supported.

This is Linux only code, it just uses sysfs to see if a control
device has been registered on the requested PCI ID
---
 libdrm/xf86drmMode.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'libdrm/xf86drmMode.h')

diff --git a/libdrm/xf86drmMode.h b/libdrm/xf86drmMode.h
index 7cc3ceca..71e779d4 100644
--- a/libdrm/xf86drmMode.h
+++ b/libdrm/xf86drmMode.h
@@ -243,3 +243,4 @@ extern drmModePropertyBlobPtr drmModeGetPropertyBlob(int fd, uint32_t blob_id);
 extern void drmModeFreePropertyBlob(drmModePropertyBlobPtr ptr);
 extern int drmModeOutputSetProperty(int fd, uint32_t output_id, uint32_t property_id,
 				    uint64_t value);
+extern int drmCheckModesettingSupported(const char *busid);
-- 
cgit v1.2.3


From 0e72819629741339af46d0e303f33482acdf0972 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Fri, 29 Feb 2008 14:07:29 +1000
Subject: drm: change fb api to take a bo handle not the bo pointer.

---
 libdrm/xf86drmMode.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'libdrm/xf86drmMode.h')

diff --git a/libdrm/xf86drmMode.h b/libdrm/xf86drmMode.h
index 71e779d4..edf9efee 100644
--- a/libdrm/xf86drmMode.h
+++ b/libdrm/xf86drmMode.h
@@ -177,7 +177,7 @@ 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,
+			uint8_t bpp, uint32_t pitch, uint32_t bo_handle,
 			uint32_t *buf_id);
 /**
  * Destroies the given framebuffer.
-- 
cgit v1.2.3


From 9d1db4ced1cd8e9e23f9ae945625a54d4f7f3721 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@linux.ie>
Date: Thu, 8 May 2008 10:26:37 +1000
Subject: cursor: pass handle not BO.

---
 libdrm/xf86drmMode.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'libdrm/xf86drmMode.h')

diff --git a/libdrm/xf86drmMode.h b/libdrm/xf86drmMode.h
index edf9efee..e5a6ee92 100644
--- a/libdrm/xf86drmMode.h
+++ b/libdrm/xf86drmMode.h
@@ -208,7 +208,7 @@ int drmModeSetCrtc(int fd, uint32_t crtcId, uint32_t bufferId,
 /**
  * Set the cursor on crtc
  */
-int drmModeSetCursor(int fd, uint32_t crtcId, drmBO *bo, uint32_t width, uint32_t height);
+int drmModeSetCursor(int fd, uint32_t crtcId, uint32_t bo_handle, uint32_t width, uint32_t height);
 
 /**
  * Move the cursor on crtc
-- 
cgit v1.2.3


From ed072ed075ec431b0746ac1aa8bad5f687d75d8c Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@linux.ie>
Date: Thu, 8 May 2008 14:01:24 +1000
Subject: drm_mode: initial replacefb implemenation

---
 libdrm/xf86drmMode.h | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'libdrm/xf86drmMode.h')

diff --git a/libdrm/xf86drmMode.h b/libdrm/xf86drmMode.h
index e5a6ee92..5171b592 100644
--- a/libdrm/xf86drmMode.h
+++ b/libdrm/xf86drmMode.h
@@ -184,6 +184,12 @@ extern int drmModeAddFB(int fd, uint32_t width, uint32_t height, uint8_t depth,
  */
 extern int drmModeRmFB(int fd, uint32_t bufferId);
 
+/**
+ * Replace a framebuffer object with a new one - for resizing the screen.
+ */
+extern int drmModeReplaceFB(int fd, uint32_t buffer_id,
+			    uint32_t width, uint32_t height, uint8_t depth,
+			    uint8_t bpp, uint32_t pitch, uint32_t bo_handle);
 
 /*
  * Crtc functions
-- 
cgit v1.2.3


From 16a8f824face8067029ef6f3d10f1723d87b23f6 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Fri, 30 May 2008 12:10:01 +1000
Subject: libdrm: add encoder retrival

---
 libdrm/xf86drmMode.h | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'libdrm/xf86drmMode.h')

diff --git a/libdrm/xf86drmMode.h b/libdrm/xf86drmMode.h
index 5171b592..a5ecd099 100644
--- a/libdrm/xf86drmMode.h
+++ b/libdrm/xf86drmMode.h
@@ -63,6 +63,9 @@ typedef struct _drmModeRes {
 	int count_outputs;
 	uint32_t *outputs;
 
+	int count_encoders;
+	uint32_t *encoders;
+
 	uint32_t min_width, max_width;
 	uint32_t min_height, max_height;
 } drmModeRes, *drmModeResPtr;
@@ -106,6 +109,13 @@ typedef struct _drmModeCrtc {
 
 } drmModeCrtc, *drmModeCrtcPtr;
 
+typedef struct _drmModeEncoder {
+	unsigned int encoder_id;
+	unsigned int encoder_type;
+	uint32_t crtcs;
+	uint32_t clones;
+} drmModeEncoder, *drmModeEncoderPtr;
+
 typedef enum {
 	DRM_MODE_CONNECTED         = 1,
 	DRM_MODE_DISCONNECTED      = 2,
@@ -221,6 +231,11 @@ int drmModeSetCursor(int fd, uint32_t crtcId, uint32_t bo_handle, uint32_t width
  */
 int drmModeMoveCursor(int fd, uint32_t crtcId, int x, int y);
 
+/**
+ * Encoder functions
+ */
+drmModeEncoderPtr drmModeGetEncoder(int fd, uint32_t encoder_id);
+
 /*
  * Output manipulation
  */
-- 
cgit v1.2.3


From fae2c17b313e2838652c32ea4a576172b4063639 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Fri, 30 May 2008 12:14:44 +1000
Subject: drm: add more encoder interfaces

---
 libdrm/xf86drmMode.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'libdrm/xf86drmMode.h')

diff --git a/libdrm/xf86drmMode.h b/libdrm/xf86drmMode.h
index a5ecd099..601a6460 100644
--- a/libdrm/xf86drmMode.h
+++ b/libdrm/xf86drmMode.h
@@ -154,6 +154,8 @@ typedef struct _drmModeOutput {
 	uint32_t *props; /**< List of property ids */
 	uint64_t *prop_values; /**< List of property values */
 
+	int count_encoders;
+	uint32_t *encoders; /**< List of encoder ids */
 } drmModeOutput, *drmModeOutputPtr;
 
 
-- 
cgit v1.2.3


From 514147e3f3180b46d3e9e6e906580fe232d4ad26 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Fri, 30 May 2008 12:29:45 +1000
Subject: drm: add encoder free function

---
 libdrm/xf86drmMode.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'libdrm/xf86drmMode.h')

diff --git a/libdrm/xf86drmMode.h b/libdrm/xf86drmMode.h
index 601a6460..85e3d912 100644
--- a/libdrm/xf86drmMode.h
+++ b/libdrm/xf86drmMode.h
@@ -165,6 +165,7 @@ extern void drmModeFreeResources( drmModeResPtr ptr );
 extern void drmModeFreeFB( drmModeFBPtr ptr );
 extern void drmModeFreeCrtc( drmModeCrtcPtr ptr );
 extern void drmModeFreeOutput( drmModeOutputPtr ptr );
+extern void drmModeFreeEncoder( drmModeEncoderPtr ptr );
 
 /**
  * Retrives all of the resources associated with a card.
-- 
cgit v1.2.3


From 9d38448ed33aaff324cc4bbe1e0878593e97d07d Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Fri, 30 May 2008 15:03:12 +1000
Subject: modesetting: the great renaming.

Okay we have crtc, encoder and connectors.

No more outputs exposed beyond driver internals

I've broken intel tv connector stuff.
Really for TV we should have one TV connector, with a sub property for the
type of signal been driven over it
---
 libdrm/xf86drmMode.h | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

(limited to 'libdrm/xf86drmMode.h')

diff --git a/libdrm/xf86drmMode.h b/libdrm/xf86drmMode.h
index 85e3d912..03268b10 100644
--- a/libdrm/xf86drmMode.h
+++ b/libdrm/xf86drmMode.h
@@ -60,8 +60,8 @@ typedef struct _drmModeRes {
 	int count_crtcs;
 	uint32_t *crtcs;
 
-	int count_outputs;
-	uint32_t *outputs;
+	int count_connectors;
+	uint32_t *connectors;
 
 	int count_encoders;
 	uint32_t *encoders;
@@ -99,11 +99,11 @@ typedef struct _drmModeCrtc {
 	int mode_valid;
 	struct drm_mode_modeinfo mode;
 
-	int count_outputs;
-	uint32_t outputs; /**< Outputs that are connected */
+	int count_connectors;
+	uint32_t connectors; /**< Connectors that are connected */
 
 	int count_possibles;
-	uint32_t possibles; /**< Outputs that can be connected */
+	uint32_t possibles; /**< Connectors that can be connected */
 
 	int gamma_size; /**< Number of gamma stops */
 
@@ -131,12 +131,12 @@ typedef enum {
 	DRM_MODE_SUBPIXEL_NONE           = 6
 } drmModeSubPixel;
 
-typedef struct _drmModeOutput {
-	unsigned int output_id;
+typedef struct _drmModeConnector {
+	unsigned int connector_id;
 
 	unsigned int crtc; /**< Crtc currently connected to */
-	unsigned int output_type;
-	unsigned int output_type_id;
+	unsigned int connector_type;
+	unsigned int connector_type_id;
 	drmModeConnection connection;
 	uint32_t mmWidth, mmHeight; /**< HxW in millimeters */
 	drmModeSubPixel subpixel;
@@ -156,7 +156,7 @@ typedef struct _drmModeOutput {
 
 	int count_encoders;
 	uint32_t *encoders; /**< List of encoder ids */
-} drmModeOutput, *drmModeOutputPtr;
+} drmModeConnector, *drmModeConnectorPtr;
 
 
 
@@ -164,7 +164,7 @@ extern void drmModeFreeModeInfo( struct drm_mode_modeinfo *ptr );
 extern void drmModeFreeResources( drmModeResPtr ptr );
 extern void drmModeFreeFB( drmModeFBPtr ptr );
 extern void drmModeFreeCrtc( drmModeCrtcPtr ptr );
-extern void drmModeFreeOutput( drmModeOutputPtr ptr );
+extern void drmModeFreeConnector( drmModeConnectorPtr ptr );
 extern void drmModeFreeEncoder( drmModeEncoderPtr ptr );
 
 /**
@@ -217,7 +217,7 @@ extern drmModeCrtcPtr drmModeGetCrtc(int fd, uint32_t crtcId);
  * Set the mode on a crtc crtcId with the given mode modeId.
  */
 int drmModeSetCrtc(int fd, uint32_t crtcId, uint32_t bufferId,
-                   uint32_t x, uint32_t y, uint32_t *outputs, int count,
+                   uint32_t x, uint32_t y, uint32_t *connectors, int count,
 		   struct drm_mode_modeinfo *mode);
 
 /*
@@ -240,31 +240,31 @@ int drmModeMoveCursor(int fd, uint32_t crtcId, int x, int y);
 drmModeEncoderPtr drmModeGetEncoder(int fd, uint32_t encoder_id);
 
 /*
- * Output manipulation
+ * Connector manipulation
  */
 
 /**
- * Retrive information about the output outputId.
+ * Retrive information about the connector connectorId.
  */
-extern drmModeOutputPtr drmModeGetOutput(int fd,
-		uint32_t outputId);
+extern drmModeConnectorPtr drmModeGetConnector(int fd,
+		uint32_t connectorId);
 
 /**
- * Attaches the given mode to an output.
+ * Attaches the given mode to an connector.
  */
-extern int drmModeAttachMode(int fd, uint32_t outputId, struct drm_mode_modeinfo *mode_info);
+extern int drmModeAttachMode(int fd, uint32_t connectorId, struct drm_mode_modeinfo *mode_info);
 
 /**
- * Detaches a mode from the output
+ * Detaches a mode from the connector
  * must be unused, by the given mode.
  */
-extern int drmModeDetachMode(int fd, uint32_t outputId, struct drm_mode_modeinfo *mode_info);
+extern int drmModeDetachMode(int fd, uint32_t connectorId, struct drm_mode_modeinfo *mode_info);
 
 extern drmModePropertyPtr drmModeGetProperty(int fd, uint32_t propertyId);
 extern void drmModeFreeProperty(drmModePropertyPtr ptr);
 
 extern drmModePropertyBlobPtr drmModeGetPropertyBlob(int fd, uint32_t blob_id);
 extern void drmModeFreePropertyBlob(drmModePropertyBlobPtr ptr);
-extern int drmModeOutputSetProperty(int fd, uint32_t output_id, uint32_t property_id,
+extern int drmModeConnectorSetProperty(int fd, uint32_t connector_id, uint32_t property_id,
 				    uint64_t value);
 extern int drmCheckModesettingSupported(const char *busid);
-- 
cgit v1.2.3


From 5d47185eb69d73dd7e6ee3ddde4d0c7642c2d5b7 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Fri, 30 May 2008 15:32:58 +1000
Subject: drm: switch possible crtc/clones over to encoders

---
 libdrm/xf86drmMode.h | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'libdrm/xf86drmMode.h')

diff --git a/libdrm/xf86drmMode.h b/libdrm/xf86drmMode.h
index 03268b10..ceaa9abc 100644
--- a/libdrm/xf86drmMode.h
+++ b/libdrm/xf86drmMode.h
@@ -141,12 +141,6 @@ typedef struct _drmModeConnector {
 	uint32_t mmWidth, mmHeight; /**< HxW in millimeters */
 	drmModeSubPixel subpixel;
 
-	int count_crtcs;
-	uint32_t crtcs; /**< Possible crtc to connect to */
-
-	int count_clones;
-	uint32_t clones; /**< Mask of clones */
-
 	int count_modes;
 	struct drm_mode_modeinfo *modes;
 
-- 
cgit v1.2.3


From dba95ec34315d62934ff0e493e085aa6a03cde7c Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Mon, 2 Jun 2008 10:41:12 +1000
Subject: drm: fixup some interfaces so test code works again

---
 libdrm/xf86drmMode.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'libdrm/xf86drmMode.h')

diff --git a/libdrm/xf86drmMode.h b/libdrm/xf86drmMode.h
index ceaa9abc..2f3a8f74 100644
--- a/libdrm/xf86drmMode.h
+++ b/libdrm/xf86drmMode.h
@@ -112,6 +112,7 @@ typedef struct _drmModeCrtc {
 typedef struct _drmModeEncoder {
 	unsigned int encoder_id;
 	unsigned int encoder_type;
+	uint32_t crtc;
 	uint32_t crtcs;
 	uint32_t clones;
 } drmModeEncoder, *drmModeEncoderPtr;
@@ -134,7 +135,7 @@ typedef enum {
 typedef struct _drmModeConnector {
 	unsigned int connector_id;
 
-	unsigned int crtc; /**< Crtc currently connected to */
+	unsigned int encoder; /**< Crtc currently connected to */
 	unsigned int connector_type;
 	unsigned int connector_type_id;
 	drmModeConnection connection;
-- 
cgit v1.2.3


From 4e7b24639808e5e1e2c05143028db1a3bc2812e9 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Mon, 2 Jun 2008 14:04:41 +1000
Subject: drm: add functions to get/set gamma ramps

---
 libdrm/xf86drmMode.h | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'libdrm/xf86drmMode.h')

diff --git a/libdrm/xf86drmMode.h b/libdrm/xf86drmMode.h
index 2f3a8f74..56908d8f 100644
--- a/libdrm/xf86drmMode.h
+++ b/libdrm/xf86drmMode.h
@@ -263,3 +263,8 @@ extern void drmModeFreePropertyBlob(drmModePropertyBlobPtr ptr);
 extern int drmModeConnectorSetProperty(int fd, uint32_t connector_id, uint32_t property_id,
 				    uint64_t value);
 extern int drmCheckModesettingSupported(const char *busid);
+
+extern int drmModeCrtcSetGamma(int fd, uint32_t crtc_id, uint32_t size,
+			       uint16_t *red, uint16_t *green, uint16_t *blue);
+extern int drmModeCrtcGetGamma(int fd, uint32_t crtc_id, uint32_t size,
+			       uint16_t *red, uint16_t *green, uint16_t *blue);
-- 
cgit v1.2.3


From 382aa3ceeb79165a9bdddc8f944de131c8cbf2dd Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Wed, 4 Jun 2008 13:49:43 +1000
Subject: drm: introduce generation counter to interface.

Idea being if you want to add new crtc/output/encoder dynamically later,
you just increase the generation counter and userspace should re-read
all the resources
---
 libdrm/xf86drmMode.h | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'libdrm/xf86drmMode.h')

diff --git a/libdrm/xf86drmMode.h b/libdrm/xf86drmMode.h
index 56908d8f..3bd30a92 100644
--- a/libdrm/xf86drmMode.h
+++ b/libdrm/xf86drmMode.h
@@ -51,9 +51,16 @@
  * buffer object interface. This object needs to be pinned.
  */
 
+/*
+ * generation - these are to be read by userspace, and if it notices
+ * while calling a get output or get crtc that the generation has changed
+ * it should re-call the mode resource functions resync its view of the
+ * outputs with current view.
+ */
 
 typedef struct _drmModeRes {
 
+	uint32_t generation;
 	int count_fbs;
 	uint32_t *fbs;
 
@@ -93,6 +100,7 @@ typedef struct _drmModeProperty {
 typedef struct _drmModeCrtc {
 	unsigned int crtc_id;
 	unsigned int buffer_id; /**< FB id to connect to 0 = disconnect*/
+	uint32_t generation;
 
 	uint32_t x, y; /**< Position on the frameuffer */
 	uint32_t width, height;
@@ -110,6 +118,7 @@ typedef struct _drmModeCrtc {
 } drmModeCrtc, *drmModeCrtcPtr;
 
 typedef struct _drmModeEncoder {
+	uint32_t generation;
 	unsigned int encoder_id;
 	unsigned int encoder_type;
 	uint32_t crtc;
@@ -133,8 +142,8 @@ typedef enum {
 } drmModeSubPixel;
 
 typedef struct _drmModeConnector {
+	uint32_t generation;
 	unsigned int connector_id;
-
 	unsigned int encoder; /**< Crtc currently connected to */
 	unsigned int connector_type;
 	unsigned int connector_type_id;
-- 
cgit v1.2.3


From 9390bdab7cce67ad0eb8103da8782aec7bfad017 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Wed, 4 Jun 2008 13:53:33 +1000
Subject: libdrm: shouldn't rely on this

---
 libdrm/xf86drmMode.h | 1 -
 1 file changed, 1 deletion(-)

(limited to 'libdrm/xf86drmMode.h')

diff --git a/libdrm/xf86drmMode.h b/libdrm/xf86drmMode.h
index 3bd30a92..f1b7c86e 100644
--- a/libdrm/xf86drmMode.h
+++ b/libdrm/xf86drmMode.h
@@ -32,7 +32,6 @@
  */
 
 #include <drm.h>
-#include "xf86mm.h"
 
 /*
  * This is the interface for modesetting for drm.
-- 
cgit v1.2.3


From 5de978905abd6d44ee2ecdc7393194a4950c595c Mon Sep 17 00:00:00 2001
From: Maarten Maathuis <madman2003@gmail.com>
Date: Thu, 3 Jul 2008 00:25:06 +0200
Subject: [libdrm] count connectors and such has no place in a crtc object

---
 libdrm/xf86drmMode.h | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'libdrm/xf86drmMode.h')

diff --git a/libdrm/xf86drmMode.h b/libdrm/xf86drmMode.h
index f1b7c86e..9f1e7a26 100644
--- a/libdrm/xf86drmMode.h
+++ b/libdrm/xf86drmMode.h
@@ -106,12 +106,6 @@ typedef struct _drmModeCrtc {
 	int mode_valid;
 	struct drm_mode_modeinfo mode;
 
-	int count_connectors;
-	uint32_t connectors; /**< Connectors that are connected */
-
-	int count_possibles;
-	uint32_t possibles; /**< Connectors that can be connected */
-
 	int gamma_size; /**< Number of gamma stops */
 
 } drmModeCrtc, *drmModeCrtcPtr;
-- 
cgit v1.2.3


From 11b7a81c8a776aa7761ee03fe55d741a44ba5df7 Mon Sep 17 00:00:00 2001
From: Maarten Maathuis <madman2003@gmail.com>
Date: Thu, 3 Jul 2008 17:25:37 +0200
Subject: libdrm: fix typo in comment

---
 libdrm/xf86drmMode.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'libdrm/xf86drmMode.h')

diff --git a/libdrm/xf86drmMode.h b/libdrm/xf86drmMode.h
index 9f1e7a26..7afc71d7 100644
--- a/libdrm/xf86drmMode.h
+++ b/libdrm/xf86drmMode.h
@@ -98,7 +98,7 @@ typedef struct _drmModeProperty {
 
 typedef struct _drmModeCrtc {
 	unsigned int crtc_id;
-	unsigned int buffer_id; /**< FB id to connect to 0 = disconnect*/
+	unsigned int buffer_id; /**< FB id to connect to 0 = disconnect */
 	uint32_t generation;
 
 	uint32_t x, y; /**< Position on the frameuffer */
@@ -137,7 +137,7 @@ typedef enum {
 typedef struct _drmModeConnector {
 	uint32_t generation;
 	unsigned int connector_id;
-	unsigned int encoder; /**< Crtc currently connected to */
+	unsigned int encoder; /**< Encoder currently connected to */
 	unsigned int connector_type;
 	unsigned int connector_type_id;
 	drmModeConnection connection;
-- 
cgit v1.2.3


From 142a309604b65c26ca95594943ee91dde8688697 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Fri, 4 Jul 2008 09:34:24 +1000
Subject: modesetting: rip out all of the generation code.

not needed, hotplug will work just as well hopefully.
---
 libdrm/xf86drmMode.h | 11 -----------
 1 file changed, 11 deletions(-)

(limited to 'libdrm/xf86drmMode.h')

diff --git a/libdrm/xf86drmMode.h b/libdrm/xf86drmMode.h
index 7afc71d7..3e2f5c0e 100644
--- a/libdrm/xf86drmMode.h
+++ b/libdrm/xf86drmMode.h
@@ -50,16 +50,8 @@
  * buffer object interface. This object needs to be pinned.
  */
 
-/*
- * generation - these are to be read by userspace, and if it notices
- * while calling a get output or get crtc that the generation has changed
- * it should re-call the mode resource functions resync its view of the
- * outputs with current view.
- */
-
 typedef struct _drmModeRes {
 
-	uint32_t generation;
 	int count_fbs;
 	uint32_t *fbs;
 
@@ -99,7 +91,6 @@ typedef struct _drmModeProperty {
 typedef struct _drmModeCrtc {
 	unsigned int crtc_id;
 	unsigned int buffer_id; /**< FB id to connect to 0 = disconnect */
-	uint32_t generation;
 
 	uint32_t x, y; /**< Position on the frameuffer */
 	uint32_t width, height;
@@ -111,7 +102,6 @@ typedef struct _drmModeCrtc {
 } drmModeCrtc, *drmModeCrtcPtr;
 
 typedef struct _drmModeEncoder {
-	uint32_t generation;
 	unsigned int encoder_id;
 	unsigned int encoder_type;
 	uint32_t crtc;
@@ -135,7 +125,6 @@ typedef enum {
 } drmModeSubPixel;
 
 typedef struct _drmModeConnector {
-	uint32_t generation;
 	unsigned int connector_id;
 	unsigned int encoder; /**< Encoder currently connected to */
 	unsigned int connector_type;
-- 
cgit v1.2.3


From 7cbc5f6145046f3775e3b3ca2862bfb71831ec44 Mon Sep 17 00:00:00 2001
From: Maarten Maathuis <madman2003@gmail.com>
Date: Sat, 5 Jul 2008 12:04:07 +0200
Subject: modesetting-101: Make the interface variable names a little more
 consistent + modeprint changes.

- All things are now called _id when they are id's.
- modeprint now accepts driver name as first argument.
---
 libdrm/xf86drmMode.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'libdrm/xf86drmMode.h')

diff --git a/libdrm/xf86drmMode.h b/libdrm/xf86drmMode.h
index 3e2f5c0e..59612a94 100644
--- a/libdrm/xf86drmMode.h
+++ b/libdrm/xf86drmMode.h
@@ -92,7 +92,7 @@ typedef struct _drmModeCrtc {
 	unsigned int crtc_id;
 	unsigned int buffer_id; /**< FB id to connect to 0 = disconnect */
 
-	uint32_t x, y; /**< Position on the frameuffer */
+	uint32_t x, y; /**< Position on the framebuffer */
 	uint32_t width, height;
 	int mode_valid;
 	struct drm_mode_modeinfo mode;
@@ -104,9 +104,9 @@ typedef struct _drmModeCrtc {
 typedef struct _drmModeEncoder {
 	unsigned int encoder_id;
 	unsigned int encoder_type;
-	uint32_t crtc;
-	uint32_t crtcs;
-	uint32_t clones;
+	unsigned int crtc_id;
+	uint32_t possible_crtcs;
+	uint32_t possible_clones;
 } drmModeEncoder, *drmModeEncoderPtr;
 
 typedef enum {
@@ -126,7 +126,7 @@ typedef enum {
 
 typedef struct _drmModeConnector {
 	unsigned int connector_id;
-	unsigned int encoder; /**< Encoder currently connected to */
+	unsigned int encoder_id; /**< Encoder currently connected to */
 	unsigned int connector_type;
 	unsigned int connector_type_id;
 	drmModeConnection connection;
-- 
cgit v1.2.3


From 1ead45c8f02e7c51cfe977383726d20479385688 Mon Sep 17 00:00:00 2001
From: Jakob Bornecrantz <jakob@tungstengraphics.com>
Date: Wed, 12 Nov 2008 18:40:04 +0100
Subject: mode: Remove hotplug support from ioctl interface

---
 libdrm/xf86drmMode.h | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'libdrm/xf86drmMode.h')

diff --git a/libdrm/xf86drmMode.h b/libdrm/xf86drmMode.h
index 59612a94..ee45717b 100644
--- a/libdrm/xf86drmMode.h
+++ b/libdrm/xf86drmMode.h
@@ -158,11 +158,6 @@ extern void drmModeFreeEncoder( drmModeEncoderPtr ptr );
  */
 extern drmModeResPtr drmModeGetResources(int fd);
 
-/**
- * Retrives the hotplug counter
- */
-extern uint32_t drmModeGetHotplug(int fd);
-
 /*
  * FrameBuffer manipulation.
  */
-- 
cgit v1.2.3


From ea849d7ca6aaedd3aba6ec7239f01426521d8604 Mon Sep 17 00:00:00 2001
From: Jakob Bornecrantz <jakob@tungstengraphics.com>
Date: Wed, 12 Nov 2008 18:49:46 +0100
Subject: mode: Unify userspace API to uint_t

---
 libdrm/xf86drmMode.h | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'libdrm/xf86drmMode.h')

diff --git a/libdrm/xf86drmMode.h b/libdrm/xf86drmMode.h
index ee45717b..b68d1469 100644
--- a/libdrm/xf86drmMode.h
+++ b/libdrm/xf86drmMode.h
@@ -77,8 +77,8 @@ typedef struct _drmModePropertyBlob {
 } drmModePropertyBlobRes, *drmModePropertyBlobPtr;
 
 typedef struct _drmModeProperty {
-	unsigned int prop_id;
-	unsigned int flags;
+	uint32_t prop_id;
+	uint32_t flags;
 	char name[DRM_PROP_NAME_LEN];
 	int count_values;
 	uint64_t *values; // store the blob lengths
@@ -89,8 +89,8 @@ typedef struct _drmModeProperty {
 } drmModePropertyRes, *drmModePropertyPtr;
 
 typedef struct _drmModeCrtc {
-	unsigned int crtc_id;
-	unsigned int buffer_id; /**< FB id to connect to 0 = disconnect */
+	uint32_t crtc_id;
+	uint32_t buffer_id; /**< FB id to connect to 0 = disconnect */
 
 	uint32_t x, y; /**< Position on the framebuffer */
 	uint32_t width, height;
@@ -102,9 +102,9 @@ typedef struct _drmModeCrtc {
 } drmModeCrtc, *drmModeCrtcPtr;
 
 typedef struct _drmModeEncoder {
-	unsigned int encoder_id;
-	unsigned int encoder_type;
-	unsigned int crtc_id;
+	uint32_t encoder_id;
+	uint32_t encoder_type;
+	uint32_t crtc_id;
 	uint32_t possible_crtcs;
 	uint32_t possible_clones;
 } drmModeEncoder, *drmModeEncoderPtr;
@@ -125,10 +125,10 @@ typedef enum {
 } drmModeSubPixel;
 
 typedef struct _drmModeConnector {
-	unsigned int connector_id;
-	unsigned int encoder_id; /**< Encoder currently connected to */
-	unsigned int connector_type;
-	unsigned int connector_type_id;
+	uint32_t connector_id;
+	uint32_t encoder_id; /**< Encoder currently connected to */
+	uint32_t connector_type;
+	uint32_t connector_type_id;
 	drmModeConnection connection;
 	uint32_t mmWidth, mmHeight; /**< HxW in millimeters */
 	drmModeSubPixel subpixel;
-- 
cgit v1.2.3