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.c | 407 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 407 insertions(+)
 create mode 100644 libdrm/xf86drmMode.c

(limited to 'libdrm/xf86drmMode.c')

diff --git a/libdrm/xf86drmMode.c b/libdrm/xf86drmMode.c
new file mode 100644
index 00000000..b48ca838
--- /dev/null
+++ b/libdrm/xf86drmMode.c
@@ -0,0 +1,407 @@
+/*
+ * \file xf86drmMode.c
+ * 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.
+ *
+ */
+
+/*
+ * TODO the types we are after are defined in diffrent headers on diffrent
+ * platforms find which headers to include to get uint32_t
+ */
+#include <stdint.h>
+
+#include "xf86drmMode.h"
+#include "xf86drm.h"
+#include <drm.h>
+
+/*
+ * Util functions
+ */
+
+void* drmAllocCpy(void *array, int count, int entry_size)
+{
+	char *r;
+	int i;
+
+	if (!count || !array || !entry_size)
+		return 0;
+
+	if (!(r = drmMalloc(count*entry_size)))
+		return 0;
+
+	for (i = 0; i < count; i++)
+		memcpy(r+(entry_size*i), array+(entry_size*i), entry_size);
+
+	return r;
+}
+
+/**
+ * Generate crtc and output ids.
+ *
+ * Will generate ids starting from 1 up to count if count is greater then 0.
+ */
+static uint32_t* drmAllocGenerate(int count)
+{
+	uint32_t *r;
+	int i;
+
+	if(0 <= count)
+		return 0;
+
+	if (!(r = drmMalloc(count*sizeof(*r))))
+		return 0;
+
+	for (i = 0; i < count; r[i] = ++i);
+
+	return 0;
+}
+
+/*
+ * A couple of free functions.
+ */
+
+void drmModeFreeModeInfo(struct drm_mode_modeinfo *ptr)
+{
+	if (!ptr)
+		return;
+
+	drmFree(ptr);
+}
+
+void drmModeFreeResources(drmModeResPtr ptr)
+{
+	if (!ptr)
+		return;
+
+	drmFree(ptr->modes);
+	drmFree(ptr);
+
+}
+
+void drmModeFreeFrameBuffer(drmModeFrameBufferPtr ptr)
+{
+	if (!ptr)
+		return;
+
+	/* we might add more frees later. */
+	drmFree(ptr);
+}
+
+void drmModeFreeCrtc(drmModeCrtcPtr ptr)
+{
+	if (!ptr)
+		return;
+
+	drmFree(ptr);
+
+}
+
+void drmModeFreeOutput(drmModeOutputPtr ptr)
+{
+	if (!ptr)
+		return;
+
+	drmFree(ptr->modes);
+	drmFree(ptr);
+
+}
+
+/*
+ * ModeSetting functions.
+ */
+
+drmModeResPtr drmModeGetResources(int fd)
+{
+	struct drm_mode_card_res res;
+	int i;
+	drmModeResPtr r = 0;
+
+	res.count_crtcs   = 0;
+	res.count_outputs = 0;
+	res.count_modes   = 0;
+	res.modes         = 0;
+
+	if (ioctl(fd, DRM_IOCTL_MODE_GETRESOURCES, &res))
+		return 0;
+
+	if (res.count_crtcs)
+		res.crtc_id = drmMalloc(res.count_crtcs*sizeof(uint32_t));
+	if (res.count_outputs)
+		res.output_id = drmMalloc(res.count_outputs*sizeof(uint32_t));
+	if (res.count_modes)
+		res.modes = drmMalloc(res.count_modes*sizeof(*res.modes));
+
+	if (ioctl(fd, DRM_IOCTL_MODE_GETRESOURCES, &res))
+		goto err_allocs;
+
+	/*
+	 * return
+	 */
+
+
+	if (!(r = drmMalloc(sizeof(*r))))
+		return 0;
+
+	r->frameBufferId = res.fb_id;
+	r->count_crtcs   = res.count_crtcs;
+	r->count_outputs = res.count_outputs;
+	r->count_modes   = res.count_modes;
+	/* TODO we realy should test if these allocs fails. */
+	r->crtcs         = drmAllocCpy(res.crtc_id, res.count_crtcs, sizeof(uint32_t));
+	r->outputs       = drmAllocCpy(res.output_id, res.count_outputs, sizeof(uint32_t));
+	r->modes         = drmAllocCpy(res.modes, res.count_modes, sizeof(struct drm_mode_modeinfo));
+
+	drmFree(res.crtc_id);
+	drmFree(res.output_id);
+	drmFree(res.modes);
+
+	return r;
+
+err_allocs:
+	drmFree(res.crtc_id);
+	drmFree(res.output_id);
+	drmFree(res.modes);
+
+	return 0;
+}
+
+#if 0
+int drmModeForceProbe(int fd, uint32_t outputId)
+{
+	/* TODO impl/keep? */
+}
+
+drmModeFrameBufferPtr drmModeGetFrameBuffer(int fd, uint32_t buf)
+{
+//	struct drm_mode_fb_cmd info;
+	drmModeFrameBufferPtr r;
+
+	//	if (ioctl(fd, DRM_IOCTL_MODE_GETFRAMEBUFFER, &info))
+		return 0;
+
+	if (!(r = drmMalloc(sizeof(*r))))
+		return 0;
+
+	/* TODO change to new code
+	r->minWidth  = info.minWidth;
+	r->maxWidth  = info.maxWidth;
+	r->minHeight = info.minHeight;
+	r->maxHeight = info.maxHeight;*/
+
+	return r;
+}
+
+uint32_t drmModeNewFrameBuffer(int fd, uint32_t width, uint32_t height,
+		uint8_t bpp, uint32_t pitch, drmBO *bo)
+{
+	drm_mode_fb_cmd_t f;
+
+	f.handle = bo->handle;
+	f.width  = width;
+	f.height = height;
+	f.pitch  = pitch;
+
+	//	if (ioctl(fd, DRM_IOCTL_MODE_NEWFRAMEBUFFER, &f))
+		return 0;
+
+	return f.bufferId;
+}
+
+int drmModeDesFrameBuffer(int fd, uint32_t bufferId)
+{
+  //	return ioctl(fd, DRM_IOCTL_MODE_DESFRAMEBUFFER, bufferId);
+}
+
+#endif
+/*
+ * Crtc function.
+ */
+
+drmModeCrtcPtr drmModeGetCrtc(int fd, uint32_t crtcId)
+{
+	struct drm_mode_crtc crtc;
+	drmModeCrtcPtr r;
+	int i = 0;
+
+	crtc.count_outputs   = 0;
+	crtc.outputs         = 0;
+	crtc.count_possibles = 0;
+	crtc.possibles       = 0;
+	crtc.crtc_id = crtcId;
+
+	if (ioctl(fd, DRM_IOCTL_MODE_GETCRTC, &crtc))
+		return 0;
+
+	/*
+	 * return
+	 */
+
+	if (!(r = drmMalloc(sizeof(*r))))
+		return 0;
+
+	r->x               = crtc.x;
+	r->y               = crtc.y;
+	r->mode            = crtc.mode;
+//	r->width           = crtc.width;
+//	r->height          = crtc.height;
+	r->bufferId        = crtc.fb_id;
+	r->gamma_size      = crtc.gamma_size;
+	r->count_outputs   = crtc.count_outputs;
+	r->count_possibles = crtc.count_possibles;
+	/* TODO we realy should test if these alloc & cpy fails. */
+	r->outputs         = crtc.outputs;
+	r->possibles       = crtc.possibles;
+
+	return r;
+
+err_allocs:
+
+	return 0;
+}
+
+#if 0
+int drmModeSetCrtc(
+		int fd, uint32_t crtcId, uint32_t bufferId,
+		uint32_t x, uint32_t y, uint32_t modeId,
+		uint32_t *outputs, int count
+	)
+{
+	struct drm_mode_crtc crtc;
+
+	crtc.count_outputs   = 0;
+	crtc.outputs         = 0;
+	crtc.count_possibles = 0;
+	crtc.possibles       = 0;
+
+	crtc.x             = x;
+	crtc.y             = y;
+	crtc.crtcId        = crtcId;
+	crtc.bufferId      = bufferId;
+	crtc.set_outputs   = outputs;
+	crtc.count_outputs = count;
+	crtc.mode          = modeId;
+
+	//	return ioctl(fd, DRM_IOCTL_MODE_SETCRTC, &crtc);
+}
+
+drmModeGammaTriplePtr drmModeGetCrtcGamma(int fd, uint32_t crtc, int *count)
+{
+	/* TODO impl */
+}
+
+int drmModeSetCrtcGamma(int fd, uint32_t crtcId,
+		drmModeGammaTriplePtr ptr, int count)
+{
+	/* TODO impl */
+}
+
+#endif
+/*
+ * Output manipulation
+ */
+drmModeOutputPtr drmModeGetOutput(int fd, uint32_t output_id)
+{
+	struct drm_mode_get_output out;
+	drmModeOutputPtr r = 0;
+
+	out.output = output_id;
+	out.count_crtcs  = 0;
+	out.crtcs        = 0;
+	out.count_clones = 0;
+	out.clones       = 0;
+	out.count_modes  = 0;
+	out.modes        = 0;
+
+	if (ioctl(fd, DRM_IOCTL_MODE_GETOUTPUT, &out))
+		return 0;
+
+	if (out.count_modes)
+		out.modes = drmMalloc(out.count_modes*sizeof(uint32_t));
+
+	if (ioctl(fd, DRM_IOCTL_MODE_GETOUTPUT, &out))
+		goto err_allocs;
+
+	if(!(r = drmMalloc(sizeof(*r))))
+		return 0;
+
+	r->connection   = out.connection;
+	r->mmWidth      = out.mm_width;
+	r->mmHeight     = out.mm_height;
+	r->subpixel     = out.subpixel;
+	r->count_crtcs  = out.count_crtcs;
+	r->count_clones = out.count_clones;
+	r->count_modes  = out.count_modes;
+	/* TODO we should test if these alloc & cpy fails. */
+	r->crtcs        = out.crtcs;
+	r->clones       = out.clones;
+	r->modes        = drmAllocCpy(out.modes, out.count_modes, sizeof(uint32_t));
+
+	return r;
+
+err_allocs:
+	drmFree(out.modes);
+
+	return 0;
+}
+
+#if 0
+uint32_t drmModeNewMode(int fd, struct drm_mode_modeinfo *modeInfo)
+{
+	/* TODO impl */
+}
+
+int drmModeDesMode(int fd, uint32_t modeId)
+{
+  //	return ioctl(fd, DRM_IOCTL_MODE_DESMODE, modeId);
+}
+
+int drmModeAddMode(int fd, uint32_t outputId, uint32_t modeId)
+{
+
+	drm_mode_outputmode_t res;
+
+	res.outputId = outputId;
+	res.modeId = modeId;
+
+	//	return ioctl(fd, DRM_IOCTL_MODE_ADDMODE, &res);
+}
+
+int drmModeDelMode(int fd, uint32_t outputId, uint32_t modeId)
+{
+	drm_mode_outputmode_t res;
+
+	res.outputId = outputId;
+	res.modeId = modeId;
+
+	//	return ioctl(fd, DRM_IOCTL_MODE_DELMODE, &res);
+}
+
+#endif
+
-- 
cgit v1.2.3


From b4094864f188a1346cc3b51bcb457beeacefbf82 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@linux.ie>
Date: Thu, 5 Apr 2007 18:01:02 +1000
Subject: checkpoint commit: implement SetCrtc so modes can in theory be set
 from user

This hooks up the userspace mode set it "seems" to work.
---
 libdrm/xf86drmMode.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'libdrm/xf86drmMode.c')

diff --git a/libdrm/xf86drmMode.c b/libdrm/xf86drmMode.c
index b48ca838..c4403b1c 100644
--- a/libdrm/xf86drmMode.c
+++ b/libdrm/xf86drmMode.c
@@ -286,7 +286,7 @@ err_allocs:
 	return 0;
 }
 
-#if 0
+
 int drmModeSetCrtc(
 		int fd, uint32_t crtcId, uint32_t bufferId,
 		uint32_t x, uint32_t y, uint32_t modeId,
@@ -302,15 +302,16 @@ int drmModeSetCrtc(
 
 	crtc.x             = x;
 	crtc.y             = y;
-	crtc.crtcId        = crtcId;
-	crtc.bufferId      = bufferId;
+	crtc.crtc_id        = crtcId;
+	crtc.fb_id      = bufferId;
 	crtc.set_outputs   = outputs;
 	crtc.count_outputs = count;
 	crtc.mode          = modeId;
 
-	//	return ioctl(fd, DRM_IOCTL_MODE_SETCRTC, &crtc);
+	return ioctl(fd, DRM_IOCTL_MODE_SETCRTC, &crtc);
 }
 
+#if 0
 drmModeGammaTriplePtr drmModeGetCrtcGamma(int fd, uint32_t crtc, int *count)
 {
 	/* TODO impl */
-- 
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.c | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

(limited to 'libdrm/xf86drmMode.c')

diff --git a/libdrm/xf86drmMode.c b/libdrm/xf86drmMode.c
index c4403b1c..55a9d91c 100644
--- a/libdrm/xf86drmMode.c
+++ b/libdrm/xf86drmMode.c
@@ -192,6 +192,28 @@ err_allocs:
 	return 0;
 }
 
+uint32_t drmModeAddFB(int fd, uint32_t width, uint32_t height,
+                               uint8_t bpp, uint32_t pitch, drmBO *bo)
+{
+	struct drm_mode_fb_cmd f;
+
+	f.width  = width;
+	f.height = height;
+	f.pitch  = pitch;
+	f.bpp    = bpp;
+	f.handle = bo->handle;
+
+	if (ioctl(fd, DRM_IOCTL_MODE_ADDFB, &f))
+		return 0;
+
+	return f.buffer_id;
+}
+
+int drmModeRmFB(int fd, uint32_t bufferId)
+{
+        return ioctl(fd, DRM_IOCTL_MODE_RMFB, bufferId);
+}
+
 #if 0
 int drmModeForceProbe(int fd, uint32_t outputId)
 {
-- 
cgit v1.2.3


From eb9bdc27879d1aa307b234bbdb0f81494dcf7095 Mon Sep 17 00:00:00 2001
From: David Airlie <airlied@asimov.stargames.com.au>
Date: Tue, 10 Apr 2007 11:51:31 +1000
Subject: mode: fixup problems with framebuffer add function

---
 libdrm/xf86drmMode.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'libdrm/xf86drmMode.c')

diff --git a/libdrm/xf86drmMode.c b/libdrm/xf86drmMode.c
index 55a9d91c..5f480890 100644
--- a/libdrm/xf86drmMode.c
+++ b/libdrm/xf86drmMode.c
@@ -192,10 +192,11 @@ err_allocs:
 	return 0;
 }
 
-uint32_t drmModeAddFB(int fd, uint32_t width, uint32_t height,
-                               uint8_t bpp, uint32_t pitch, drmBO *bo)
+int drmModeAddFB(int fd, uint32_t width, uint32_t height,
+                 uint8_t bpp, uint32_t pitch, drmBO *bo, uint32_t *buf_id)
 {
 	struct drm_mode_fb_cmd f;
+	int ret;
 
 	f.width  = width;
 	f.height = height;
@@ -203,10 +204,11 @@ uint32_t drmModeAddFB(int fd, uint32_t width, uint32_t height,
 	f.bpp    = bpp;
 	f.handle = bo->handle;
 
-	if (ioctl(fd, DRM_IOCTL_MODE_ADDFB, &f))
-		return 0;
+	if (ret = ioctl(fd, DRM_IOCTL_MODE_ADDFB, &f))
+		return ret;
 
-	return f.buffer_id;
+	*buf_id = f.buffer_id;
+	return 0;
 }
 
 int drmModeRmFB(int fd, uint32_t bufferId)
-- 
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.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'libdrm/xf86drmMode.c')

diff --git a/libdrm/xf86drmMode.c b/libdrm/xf86drmMode.c
index 5f480890..df8ea8ee 100644
--- a/libdrm/xf86drmMode.c
+++ b/libdrm/xf86drmMode.c
@@ -311,11 +311,9 @@ err_allocs:
 }
 
 
-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 modeId,
+                   uint32_t *outputs, int count)
 {
 	struct drm_mode_crtc crtc;
 
-- 
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.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'libdrm/xf86drmMode.c')

diff --git a/libdrm/xf86drmMode.c b/libdrm/xf86drmMode.c
index df8ea8ee..c0444e65 100644
--- a/libdrm/xf86drmMode.c
+++ b/libdrm/xf86drmMode.c
@@ -40,6 +40,7 @@
 #include "xf86drmMode.h"
 #include "xf86drm.h"
 #include <drm.h>
+#include <string.h>
 
 /*
  * Util functions
@@ -385,7 +386,8 @@ drmModeOutputPtr drmModeGetOutput(int fd, uint32_t output_id)
 	r->crtcs        = out.crtcs;
 	r->clones       = out.clones;
 	r->modes        = drmAllocCpy(out.modes, out.count_modes, sizeof(uint32_t));
-
+	strncpy(r->name, out.name, DRM_OUTPUT_NAME_LEN);
+	r->name[DRM_OUTPUT_NAME_LEN-1] = 0;
 	return r;
 
 err_allocs:
-- 
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.c | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

(limited to 'libdrm/xf86drmMode.c')

diff --git a/libdrm/xf86drmMode.c b/libdrm/xf86drmMode.c
index c0444e65..7f0252ce 100644
--- a/libdrm/xf86drmMode.c
+++ b/libdrm/xf86drmMode.c
@@ -144,14 +144,13 @@ drmModeResPtr drmModeGetResources(int fd)
 	int i;
 	drmModeResPtr r = 0;
 
-	res.count_crtcs   = 0;
-	res.count_outputs = 0;
-	res.count_modes   = 0;
-	res.modes         = 0;
+	memset(&res, 0, sizeof(struct drm_mode_card_res));
 
 	if (ioctl(fd, DRM_IOCTL_MODE_GETRESOURCES, &res))
 		return 0;
 
+	if (res.count_fbs)
+		res.fb_id = drmMalloc(res.count_fbs*sizeof(uint32_t));
 	if (res.count_crtcs)
 		res.crtc_id = drmMalloc(res.count_crtcs*sizeof(uint32_t));
 	if (res.count_outputs)
@@ -159,8 +158,10 @@ drmModeResPtr drmModeGetResources(int fd)
 	if (res.count_modes)
 		res.modes = drmMalloc(res.count_modes*sizeof(*res.modes));
 
-	if (ioctl(fd, DRM_IOCTL_MODE_GETRESOURCES, &res))
+	if (ioctl(fd, DRM_IOCTL_MODE_GETRESOURCES, &res)) {
+		r = NULL;
 		goto err_allocs;
+	}
 
 	/*
 	 * return
@@ -170,27 +171,23 @@ drmModeResPtr drmModeGetResources(int fd)
 	if (!(r = drmMalloc(sizeof(*r))))
 		return 0;
 
-	r->frameBufferId = res.fb_id;
+	r->count_fbs     = res.count_fbs;
 	r->count_crtcs   = res.count_crtcs;
 	r->count_outputs = res.count_outputs;
 	r->count_modes   = res.count_modes;
 	/* TODO we realy should test if these allocs fails. */
+	r->fbs           = drmAllocCpy(res.fb_id, res.count_fbs, sizeof(uint32_t));
 	r->crtcs         = drmAllocCpy(res.crtc_id, res.count_crtcs, sizeof(uint32_t));
 	r->outputs       = drmAllocCpy(res.output_id, res.count_outputs, sizeof(uint32_t));
 	r->modes         = drmAllocCpy(res.modes, res.count_modes, sizeof(struct drm_mode_modeinfo));
 
-	drmFree(res.crtc_id);
-	drmFree(res.output_id);
-	drmFree(res.modes);
-
-	return r;
-
 err_allocs:
+	drmFree(res.fb_id);
 	drmFree(res.crtc_id);
 	drmFree(res.output_id);
 	drmFree(res.modes);
 
-	return 0;
+	return r;
 }
 
 int drmModeAddFB(int fd, uint32_t width, uint32_t height,
@@ -214,7 +211,7 @@ int drmModeAddFB(int fd, uint32_t width, uint32_t height,
 
 int drmModeRmFB(int fd, uint32_t bufferId)
 {
-        return ioctl(fd, DRM_IOCTL_MODE_RMFB, bufferId);
+	return ioctl(fd, DRM_IOCTL_MODE_RMFB, bufferId);
 }
 
 #if 0
-- 
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.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'libdrm/xf86drmMode.c')

diff --git a/libdrm/xf86drmMode.c b/libdrm/xf86drmMode.c
index 7f0252ce..04fb07dc 100644
--- a/libdrm/xf86drmMode.c
+++ b/libdrm/xf86drmMode.c
@@ -190,7 +190,7 @@ err_allocs:
 	return r;
 }
 
-int drmModeAddFB(int fd, uint32_t width, uint32_t height,
+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)
 {
 	struct drm_mode_fb_cmd f;
@@ -200,6 +200,7 @@ int drmModeAddFB(int fd, uint32_t width, uint32_t height,
 	f.height = height;
 	f.pitch  = pitch;
 	f.bpp    = bpp;
+	f.depth  = depth;
 	f.handle = bo->handle;
 
 	if (ret = ioctl(fd, DRM_IOCTL_MODE_ADDFB, &f))
-- 
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.c | 52 +++++++++++++++++-----------------------------------
 1 file changed, 17 insertions(+), 35 deletions(-)

(limited to 'libdrm/xf86drmMode.c')

diff --git a/libdrm/xf86drmMode.c b/libdrm/xf86drmMode.c
index 04fb07dc..6070ec6f 100644
--- a/libdrm/xf86drmMode.c
+++ b/libdrm/xf86drmMode.c
@@ -215,51 +215,33 @@ int drmModeRmFB(int fd, uint32_t bufferId)
 	return ioctl(fd, DRM_IOCTL_MODE_RMFB, bufferId);
 }
 
-#if 0
-int drmModeForceProbe(int fd, uint32_t outputId)
-{
-	/* TODO impl/keep? */
-}
-
-drmModeFrameBufferPtr drmModeGetFrameBuffer(int fd, uint32_t buf)
+drmModeFrameBufferPtr drmModeGetFB(int fd, uint32_t buf)
 {
-//	struct drm_mode_fb_cmd info;
+	struct drm_mode_fb_cmd info;
 	drmModeFrameBufferPtr r;
 
-	//	if (ioctl(fd, DRM_IOCTL_MODE_GETFRAMEBUFFER, &info))
-		return 0;
+	info.buffer_id = buf;
+
+	if (ioctl(fd, DRM_IOCTL_MODE_GETFB, &info))
+		return NULL;
 
 	if (!(r = drmMalloc(sizeof(*r))))
-		return 0;
+		return NULL;
 
-	/* TODO change to new code
-	r->minWidth  = info.minWidth;
-	r->maxWidth  = info.maxWidth;
-	r->minHeight = info.minHeight;
-	r->maxHeight = info.maxHeight;*/
+	r->buffer_id = info.buffer_id;
+	r->width = info.width;
+	r->height = info.height;
+	r->pitch = info.pitch;
+	r->bpp = info.bpp;
+	r->handle = info.handle;
+	r->depth = info.depth;
 
 	return r;
 }
-
-uint32_t drmModeNewFrameBuffer(int fd, uint32_t width, uint32_t height,
-		uint8_t bpp, uint32_t pitch, drmBO *bo)
-{
-	drm_mode_fb_cmd_t f;
-
-	f.handle = bo->handle;
-	f.width  = width;
-	f.height = height;
-	f.pitch  = pitch;
-
-	//	if (ioctl(fd, DRM_IOCTL_MODE_NEWFRAMEBUFFER, &f))
-		return 0;
-
-	return f.bufferId;
-}
-
-int drmModeDesFrameBuffer(int fd, uint32_t bufferId)
+#if 0
+int drmModeForceProbe(int fd, uint32_t outputId)
 {
-  //	return ioctl(fd, DRM_IOCTL_MODE_DESFRAMEBUFFER, bufferId);
+	/* TODO impl/keep? */
 }
 
 #endif
-- 
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.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'libdrm/xf86drmMode.c')

diff --git a/libdrm/xf86drmMode.c b/libdrm/xf86drmMode.c
index 6070ec6f..cb534678 100644
--- a/libdrm/xf86drmMode.c
+++ b/libdrm/xf86drmMode.c
@@ -276,7 +276,7 @@ drmModeCrtcPtr drmModeGetCrtc(int fd, uint32_t crtcId)
 	r->mode            = crtc.mode;
 //	r->width           = crtc.width;
 //	r->height          = crtc.height;
-	r->bufferId        = crtc.fb_id;
+	r->buffer_id        = crtc.fb_id;
 	r->gamma_size      = crtc.gamma_size;
 	r->count_outputs   = crtc.count_outputs;
 	r->count_possibles = crtc.count_possibles;
-- 
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.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'libdrm/xf86drmMode.c')

diff --git a/libdrm/xf86drmMode.c b/libdrm/xf86drmMode.c
index cb534678..b695467b 100644
--- a/libdrm/xf86drmMode.c
+++ b/libdrm/xf86drmMode.c
@@ -106,7 +106,7 @@ void drmModeFreeResources(drmModeResPtr ptr)
 
 }
 
-void drmModeFreeFrameBuffer(drmModeFrameBufferPtr ptr)
+void drmModeFreeFB(drmModeFBPtr ptr)
 {
 	if (!ptr)
 		return;
@@ -215,10 +215,10 @@ int drmModeRmFB(int fd, uint32_t bufferId)
 	return ioctl(fd, DRM_IOCTL_MODE_RMFB, bufferId);
 }
 
-drmModeFrameBufferPtr drmModeGetFB(int fd, uint32_t buf)
+drmModeFBPtr drmModeGetFB(int fd, uint32_t buf)
 {
 	struct drm_mode_fb_cmd info;
-	drmModeFrameBufferPtr r;
+	drmModeFBPtr r;
 
 	info.buffer_id = buf;
 
-- 
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.c | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

(limited to 'libdrm/xf86drmMode.c')

diff --git a/libdrm/xf86drmMode.c b/libdrm/xf86drmMode.c
index b695467b..93b0af76 100644
--- a/libdrm/xf86drmMode.c
+++ b/libdrm/xf86drmMode.c
@@ -376,37 +376,38 @@ err_allocs:
 	return 0;
 }
 
-#if 0
-uint32_t drmModeNewMode(int fd, struct drm_mode_modeinfo *modeInfo)
+uint32_t drmModeAddMode(int fd, struct drm_mode_modeinfo *mode_info)
 {
-	/* TODO impl */
+	if (ioctl(fd, DRM_IOCTL_MODE_ADDMODE, mode_info))
+		return 0;
+	
+	return mode_info->id;
 }
 
-int drmModeDesMode(int fd, uint32_t modeId)
+int drmModeRmMode(int fd, uint32_t mode_id)
 {
-  //	return ioctl(fd, DRM_IOCTL_MODE_DESMODE, modeId);
+  	return ioctl(fd, DRM_IOCTL_MODE_RMMODE, mode_id);
 }
 
-int drmModeAddMode(int fd, uint32_t outputId, uint32_t modeId)
+int drmModeAttachMode(int fd, uint32_t output_id, uint32_t mode_id)
 {
 
-	drm_mode_outputmode_t res;
+	struct drm_mode_mode_cmd res;
 
-	res.outputId = outputId;
-	res.modeId = modeId;
+	res.output_id = output_id;
+	res.mode_id = mode_id;
 
-	//	return ioctl(fd, DRM_IOCTL_MODE_ADDMODE, &res);
+	return ioctl(fd, DRM_IOCTL_MODE_ATTACHMODE, &res);
 }
 
-int drmModeDelMode(int fd, uint32_t outputId, uint32_t modeId)
+int drmModeDetachMode(int fd, uint32_t output_id, uint32_t mode_id)
 {
-	drm_mode_outputmode_t res;
+	struct drm_mode_mode_cmd res;
 
-	res.outputId = outputId;
-	res.modeId = modeId;
+	res.output_id = output_id;
+	res.mode_id = mode_id;
 
-	//	return ioctl(fd, DRM_IOCTL_MODE_DELMODE, &res);
+	return ioctl(fd, DRM_IOCTL_MODE_DETACHMODE, &res);
 }
 
-#endif
 
-- 
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.c | 30 ++++++------------------------
 1 file changed, 6 insertions(+), 24 deletions(-)

(limited to 'libdrm/xf86drmMode.c')

diff --git a/libdrm/xf86drmMode.c b/libdrm/xf86drmMode.c
index 93b0af76..a7241ffd 100644
--- a/libdrm/xf86drmMode.c
+++ b/libdrm/xf86drmMode.c
@@ -238,15 +238,10 @@ drmModeFBPtr drmModeGetFB(int fd, uint32_t buf)
 
 	return r;
 }
-#if 0
-int drmModeForceProbe(int fd, uint32_t outputId)
-{
-	/* TODO impl/keep? */
-}
 
-#endif
+
 /*
- * Crtc function.
+ * Crtc functions
  */
 
 drmModeCrtcPtr drmModeGetCrtc(int fd, uint32_t crtcId)
@@ -274,9 +269,7 @@ drmModeCrtcPtr drmModeGetCrtc(int fd, uint32_t crtcId)
 	r->x               = crtc.x;
 	r->y               = crtc.y;
 	r->mode            = crtc.mode;
-//	r->width           = crtc.width;
-//	r->height          = crtc.height;
-	r->buffer_id        = crtc.fb_id;
+	r->buffer_id       = crtc.fb_id;
 	r->gamma_size      = crtc.gamma_size;
 	r->count_outputs   = crtc.count_outputs;
 	r->count_possibles = crtc.count_possibles;
@@ -305,8 +298,8 @@ int drmModeSetCrtc(int fd, uint32_t crtcId, uint32_t bufferId,
 
 	crtc.x             = x;
 	crtc.y             = y;
-	crtc.crtc_id        = crtcId;
-	crtc.fb_id      = bufferId;
+	crtc.crtc_id       = crtcId;
+	crtc.fb_id         = bufferId;
 	crtc.set_outputs   = outputs;
 	crtc.count_outputs = count;
 	crtc.mode          = modeId;
@@ -314,22 +307,11 @@ int drmModeSetCrtc(int fd, uint32_t crtcId, uint32_t bufferId,
 	return ioctl(fd, DRM_IOCTL_MODE_SETCRTC, &crtc);
 }
 
-#if 0
-drmModeGammaTriplePtr drmModeGetCrtcGamma(int fd, uint32_t crtc, int *count)
-{
-	/* TODO impl */
-}
 
-int drmModeSetCrtcGamma(int fd, uint32_t crtcId,
-		drmModeGammaTriplePtr ptr, int count)
-{
-	/* TODO impl */
-}
-
-#endif
 /*
  * Output manipulation
  */
+
 drmModeOutputPtr drmModeGetOutput(int fd, uint32_t output_id)
 {
 	struct drm_mode_get_output out;
-- 
cgit v1.2.3


From 5e86f67a34c50ec49e1d7b3b834d1695ebf5d4c8 Mon Sep 17 00:00:00 2001
From: Alan Hourihane <alanh@tungstengraphics.com>
Date: Mon, 5 Nov 2007 10:00:11 +0000
Subject: pass pointer for drmModeRmFB

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

(limited to 'libdrm/xf86drmMode.c')

diff --git a/libdrm/xf86drmMode.c b/libdrm/xf86drmMode.c
index a7241ffd..cfe133fe 100644
--- a/libdrm/xf86drmMode.c
+++ b/libdrm/xf86drmMode.c
@@ -212,7 +212,7 @@ int drmModeAddFB(int fd, uint32_t width, uint32_t height, uint8_t depth,
 
 int drmModeRmFB(int fd, uint32_t bufferId)
 {
-	return ioctl(fd, DRM_IOCTL_MODE_RMFB, bufferId);
+	return ioctl(fd, DRM_IOCTL_MODE_RMFB, &bufferId);
 }
 
 drmModeFBPtr drmModeGetFB(int fd, uint32_t buf)
-- 
cgit v1.2.3


From 0bee83a8c8bca817459a0ee9caa6e13f3f1aa281 Mon Sep 17 00:00:00 2001
From: Alan Hourihane <alanh@tungstengraphics.com>
Date: Mon, 5 Nov 2007 10:00:43 +0000
Subject: Pass pointer to drmModeRmMode.

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

(limited to 'libdrm/xf86drmMode.c')

diff --git a/libdrm/xf86drmMode.c b/libdrm/xf86drmMode.c
index cfe133fe..e7ac58ba 100644
--- a/libdrm/xf86drmMode.c
+++ b/libdrm/xf86drmMode.c
@@ -368,7 +368,7 @@ uint32_t drmModeAddMode(int fd, struct drm_mode_modeinfo *mode_info)
 
 int drmModeRmMode(int fd, uint32_t mode_id)
 {
-  	return ioctl(fd, DRM_IOCTL_MODE_RMMODE, mode_id);
+  	return ioctl(fd, DRM_IOCTL_MODE_RMMODE, &mode_id);
 }
 
 int drmModeAttachMode(int fd, uint32_t output_id, uint32_t mode_id)
-- 
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.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'libdrm/xf86drmMode.c')

diff --git a/libdrm/xf86drmMode.c b/libdrm/xf86drmMode.c
index e7ac58ba..c3abb2df 100644
--- a/libdrm/xf86drmMode.c
+++ b/libdrm/xf86drmMode.c
@@ -265,7 +265,8 @@ drmModeCrtcPtr drmModeGetCrtc(int fd, uint32_t crtcId)
 
 	if (!(r = drmMalloc(sizeof(*r))))
 		return 0;
-
+	
+	r->crtc_id         = crtc.crtc_id;
 	r->x               = crtc.x;
 	r->y               = crtc.y;
 	r->mode            = crtc.mode;
@@ -337,6 +338,7 @@ drmModeOutputPtr drmModeGetOutput(int fd, uint32_t output_id)
 	if(!(r = drmMalloc(sizeof(*r))))
 		return 0;
 
+	r->output_id = out.output;
 	r->connection   = out.connection;
 	r->mmWidth      = out.mm_width;
 	r->mmHeight     = out.mm_height;
-- 
cgit v1.2.3


From ca499f4d14ae29159f13957f2adc0536c71bf6d4 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@linux.ie>
Date: Thu, 15 Nov 2007 19:22:01 +1100
Subject: libdrm: return crtc id to userspace

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

(limited to 'libdrm/xf86drmMode.c')

diff --git a/libdrm/xf86drmMode.c b/libdrm/xf86drmMode.c
index c3abb2df..e400f219 100644
--- a/libdrm/xf86drmMode.c
+++ b/libdrm/xf86drmMode.c
@@ -339,6 +339,7 @@ drmModeOutputPtr drmModeGetOutput(int fd, uint32_t output_id)
 		return 0;
 
 	r->output_id = out.output;
+	r->crtc = out.crtc;
 	r->connection   = out.connection;
 	r->mmWidth      = out.mm_width;
 	r->mmHeight     = out.mm_height;
-- 
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.c | 77 ++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 72 insertions(+), 5 deletions(-)

(limited to 'libdrm/xf86drmMode.c')

diff --git a/libdrm/xf86drmMode.c b/libdrm/xf86drmMode.c
index e400f219..f697232d 100644
--- a/libdrm/xf86drmMode.c
+++ b/libdrm/xf86drmMode.c
@@ -316,7 +316,7 @@ int drmModeSetCrtc(int fd, uint32_t crtcId, uint32_t bufferId,
 drmModeOutputPtr drmModeGetOutput(int fd, uint32_t output_id)
 {
 	struct drm_mode_get_output out;
-	drmModeOutputPtr r = 0;
+	drmModeOutputPtr r = NULL;
 
 	out.output = output_id;
 	out.count_crtcs  = 0;
@@ -325,18 +325,27 @@ drmModeOutputPtr drmModeGetOutput(int fd, uint32_t output_id)
 	out.clones       = 0;
 	out.count_modes  = 0;
 	out.modes        = 0;
+	out.count_props  = 0;
+	out.props = NULL;
+	out.prop_values = NULL;
 
 	if (ioctl(fd, DRM_IOCTL_MODE_GETOUTPUT, &out))
 		return 0;
 
+	if (out.count_props) {
+		out.props = drmMalloc(out.count_props*sizeof(uint32_t));
+		out.prop_values = drmMalloc(out.count_props*sizeof(uint32_t));
+	}
+
 	if (out.count_modes)
 		out.modes = drmMalloc(out.count_modes*sizeof(uint32_t));
 
 	if (ioctl(fd, DRM_IOCTL_MODE_GETOUTPUT, &out))
 		goto err_allocs;
 
-	if(!(r = drmMalloc(sizeof(*r))))
-		return 0;
+	if(!(r = drmMalloc(sizeof(*r)))) {
+		goto err_allocs;
+	}
 
 	r->output_id = out.output;
 	r->crtc = out.crtc;
@@ -350,15 +359,19 @@ drmModeOutputPtr drmModeGetOutput(int fd, uint32_t output_id)
 	/* TODO we should test if these alloc & cpy fails. */
 	r->crtcs        = out.crtcs;
 	r->clones       = out.clones;
+	r->count_props  = out.count_props;
+	r->props        = drmAllocCpy(out.props, out.count_props, sizeof(uint32_t));
+	r->prop_values  = drmAllocCpy(out.prop_values, out.count_props, sizeof(uint32_t));
 	r->modes        = drmAllocCpy(out.modes, out.count_modes, sizeof(uint32_t));
 	strncpy(r->name, out.name, DRM_OUTPUT_NAME_LEN);
 	r->name[DRM_OUTPUT_NAME_LEN-1] = 0;
-	return r;
 
 err_allocs:
+	drmFree(out.prop_values);
+	drmFree(out.props);
 	drmFree(out.modes);
 
-	return 0;
+	return r;
 }
 
 uint32_t drmModeAddMode(int fd, struct drm_mode_modeinfo *mode_info)
@@ -396,3 +409,57 @@ int drmModeDetachMode(int fd, uint32_t output_id, uint32_t mode_id)
 }
 
 
+drmModePropertyPtr drmModeGetProperty(int fd, uint32_t property_id)
+{
+	struct drm_mode_get_property prop;
+	drmModePropertyPtr r;
+
+	prop.prop_id = property_id;
+	prop.count_enums = 0;
+	prop.count_values = 0;
+	prop.flags = 0;
+	prop.enums = NULL;
+	prop.values = NULL;
+
+	if (ioctl(fd, DRM_IOCTL_MODE_GETPROPERTY, &prop))
+		return 0;
+
+	if (prop.count_values)
+		prop.values = drmMalloc(prop.count_values * sizeof(uint32_t));
+
+	if (prop.count_enums)
+		prop.enums = drmMalloc(prop.count_enums * sizeof(struct drm_mode_property_enum));
+
+	if (ioctl(fd, DRM_IOCTL_MODE_GETPROPERTY, &prop)) {
+		r = NULL;
+		goto err_allocs;
+	}
+
+	if (!(r = drmMalloc(sizeof(*r))))
+		return NULL;
+	
+	r->prop_id = prop.prop_id;
+	r->count_values = prop.count_values;
+	r->count_enums = prop.count_enums;
+
+	r->values = drmAllocCpy(prop.values, prop.count_values, sizeof(uint32_t));
+	r->enums = drmAllocCpy(prop.enums, prop.count_enums, sizeof(struct drm_mode_property_enum));
+	strncpy(r->name, prop.name, DRM_PROP_NAME_LEN);
+	r->name[DRM_PROP_NAME_LEN-1] = 0;
+
+err_allocs:
+	drmFree(prop.values);
+	drmFree(prop.enums);
+
+	return r;
+}
+
+void drmModeFreeProperty(drmModePropertyPtr ptr)
+{
+	if (!ptr)
+		return;
+
+	drmFree(ptr->values);
+	drmFree(ptr->enums);
+	drmFree(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.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'libdrm/xf86drmMode.c')

diff --git a/libdrm/xf86drmMode.c b/libdrm/xf86drmMode.c
index f697232d..8b701381 100644
--- a/libdrm/xf86drmMode.c
+++ b/libdrm/xf86drmMode.c
@@ -101,7 +101,6 @@ void drmModeFreeResources(drmModeResPtr ptr)
 	if (!ptr)
 		return;
 
-	drmFree(ptr->modes);
 	drmFree(ptr);
 
 }
@@ -155,8 +154,6 @@ drmModeResPtr drmModeGetResources(int fd)
 		res.crtc_id = drmMalloc(res.count_crtcs*sizeof(uint32_t));
 	if (res.count_outputs)
 		res.output_id = drmMalloc(res.count_outputs*sizeof(uint32_t));
-	if (res.count_modes)
-		res.modes = drmMalloc(res.count_modes*sizeof(*res.modes));
 
 	if (ioctl(fd, DRM_IOCTL_MODE_GETRESOURCES, &res)) {
 		r = NULL;
@@ -174,18 +171,15 @@ drmModeResPtr drmModeGetResources(int fd)
 	r->count_fbs     = res.count_fbs;
 	r->count_crtcs   = res.count_crtcs;
 	r->count_outputs = res.count_outputs;
-	r->count_modes   = res.count_modes;
 	/* TODO we realy should test if these allocs fails. */
 	r->fbs           = drmAllocCpy(res.fb_id, res.count_fbs, sizeof(uint32_t));
 	r->crtcs         = drmAllocCpy(res.crtc_id, res.count_crtcs, sizeof(uint32_t));
 	r->outputs       = drmAllocCpy(res.output_id, res.count_outputs, sizeof(uint32_t));
-	r->modes         = drmAllocCpy(res.modes, res.count_modes, sizeof(struct drm_mode_modeinfo));
 
 err_allocs:
 	drmFree(res.fb_id);
 	drmFree(res.crtc_id);
 	drmFree(res.output_id);
-	drmFree(res.modes);
 
 	return r;
 }
@@ -287,8 +281,8 @@ err_allocs:
 
 
 int drmModeSetCrtc(int fd, uint32_t crtcId, uint32_t bufferId,
-                   uint32_t x, uint32_t y, uint32_t modeId,
-                   uint32_t *outputs, int count)
+                   uint32_t x, uint32_t y, uint32_t *outputs, int count,
+		   struct drm_mode_modeinfo *mode)
 {
 	struct drm_mode_crtc crtc;
 
@@ -303,7 +297,11 @@ int drmModeSetCrtc(int fd, uint32_t crtcId, uint32_t bufferId,
 	crtc.fb_id         = bufferId;
 	crtc.set_outputs   = outputs;
 	crtc.count_outputs = count;
-	crtc.mode          = modeId;
+	if (mode) {
+	  memcpy(&crtc.mode, mode, sizeof(struct drm_mode_modeinfo));
+	  crtc.mode_valid = 1;
+	} else
+	  crtc.mode_valid = 0;
 
 	return ioctl(fd, DRM_IOCTL_MODE_SETCRTC, &crtc);
 }
@@ -338,7 +336,7 @@ drmModeOutputPtr drmModeGetOutput(int fd, uint32_t output_id)
 	}
 
 	if (out.count_modes)
-		out.modes = drmMalloc(out.count_modes*sizeof(uint32_t));
+		out.modes = drmMalloc(out.count_modes*sizeof(struct drm_mode_modeinfo));
 
 	if (ioctl(fd, DRM_IOCTL_MODE_GETOUTPUT, &out))
 		goto err_allocs;
@@ -362,7 +360,7 @@ drmModeOutputPtr drmModeGetOutput(int fd, uint32_t output_id)
 	r->count_props  = out.count_props;
 	r->props        = drmAllocCpy(out.props, out.count_props, sizeof(uint32_t));
 	r->prop_values  = drmAllocCpy(out.prop_values, out.count_props, sizeof(uint32_t));
-	r->modes        = drmAllocCpy(out.modes, out.count_modes, sizeof(uint32_t));
+	r->modes        = drmAllocCpy(out.modes, out.count_modes, sizeof(struct drm_mode_modeinfo));
 	strncpy(r->name, out.name, DRM_OUTPUT_NAME_LEN);
 	r->name[DRM_OUTPUT_NAME_LEN-1] = 0;
 
@@ -374,6 +372,7 @@ err_allocs:
 	return r;
 }
 
+#if 0
 uint32_t drmModeAddMode(int fd, struct drm_mode_modeinfo *mode_info)
 {
 	if (ioctl(fd, DRM_IOCTL_MODE_ADDMODE, mode_info))
@@ -386,6 +385,7 @@ int drmModeRmMode(int fd, uint32_t mode_id)
 {
   	return ioctl(fd, DRM_IOCTL_MODE_RMMODE, &mode_id);
 }
+#endif
 
 int drmModeAttachMode(int fd, uint32_t output_id, uint32_t mode_id)
 {
-- 
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.c | 24 ++++--------------------
 1 file changed, 4 insertions(+), 20 deletions(-)

(limited to 'libdrm/xf86drmMode.c')

diff --git a/libdrm/xf86drmMode.c b/libdrm/xf86drmMode.c
index 8b701381..cf596730 100644
--- a/libdrm/xf86drmMode.c
+++ b/libdrm/xf86drmMode.c
@@ -372,38 +372,22 @@ err_allocs:
 	return r;
 }
 
-#if 0
-uint32_t drmModeAddMode(int fd, struct drm_mode_modeinfo *mode_info)
+int drmModeAttachMode(int fd, uint32_t output_id, struct drm_mode_modeinfo *mode_info)
 {
-	if (ioctl(fd, DRM_IOCTL_MODE_ADDMODE, mode_info))
-		return 0;
-	
-	return mode_info->id;
-}
-
-int drmModeRmMode(int fd, uint32_t mode_id)
-{
-  	return ioctl(fd, DRM_IOCTL_MODE_RMMODE, &mode_id);
-}
-#endif
-
-int drmModeAttachMode(int fd, uint32_t output_id, uint32_t mode_id)
-{
-
 	struct drm_mode_mode_cmd res;
 
+	memcpy(&res.mode, mode_info, sizeof(struct drm_mode_modeinfo));
 	res.output_id = output_id;
-	res.mode_id = mode_id;
 
 	return ioctl(fd, DRM_IOCTL_MODE_ATTACHMODE, &res);
 }
 
-int drmModeDetachMode(int fd, uint32_t output_id, uint32_t mode_id)
+int drmModeDetachMode(int fd, uint32_t output_id, struct drm_mode_modeinfo *mode_info)
 {
 	struct drm_mode_mode_cmd res;
 
+	memcpy(&res.mode, mode_info, sizeof(struct drm_mode_modeinfo));
 	res.output_id = output_id;
-	res.mode_id = mode_id;
 
 	return ioctl(fd, DRM_IOCTL_MODE_DETACHMODE, &res);
 }
-- 
cgit v1.2.3


From 34bb2e733a612de49a390babddd8477825deb895 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Mon, 3 Dec 2007 15:27:49 +1000
Subject: mode: copy back the mode if is valid correctly

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

(limited to 'libdrm/xf86drmMode.c')

diff --git a/libdrm/xf86drmMode.c b/libdrm/xf86drmMode.c
index cf596730..bb7be13c 100644
--- a/libdrm/xf86drmMode.c
+++ b/libdrm/xf86drmMode.c
@@ -263,7 +263,9 @@ drmModeCrtcPtr drmModeGetCrtc(int fd, uint32_t crtcId)
 	r->crtc_id         = crtc.crtc_id;
 	r->x               = crtc.x;
 	r->y               = crtc.y;
-	r->mode            = crtc.mode;
+	r->mode_valid      = crtc.mode_valid;
+	if (r->mode_valid)
+		memcpy(&r->mode, &crtc.mode, sizeof(struct drm_mode_modeinfo));
 	r->buffer_id       = crtc.fb_id;
 	r->gamma_size      = crtc.gamma_size;
 	r->count_outputs   = crtc.count_outputs;
-- 
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.c | 75 ++++++++++++++++++++++++++++------------------------
 1 file changed, 41 insertions(+), 34 deletions(-)

(limited to 'libdrm/xf86drmMode.c')

diff --git a/libdrm/xf86drmMode.c b/libdrm/xf86drmMode.c
index bb7be13c..e5191d8c 100644
--- a/libdrm/xf86drmMode.c
+++ b/libdrm/xf86drmMode.c
@@ -42,6 +42,9 @@
 #include <drm.h>
 #include <string.h>
 
+#define U642VOID(x) ((void *)(unsigned long)(x))
+#define VOID2U64(x) ((uint64_t)(unsigned long)(x))
+
 /*
  * Util functions
  */
@@ -149,11 +152,11 @@ drmModeResPtr drmModeGetResources(int fd)
 		return 0;
 
 	if (res.count_fbs)
-		res.fb_id = drmMalloc(res.count_fbs*sizeof(uint32_t));
+		res.fb_id_ptr = VOID2U64(drmMalloc(res.count_fbs*sizeof(uint32_t)));
 	if (res.count_crtcs)
-		res.crtc_id = drmMalloc(res.count_crtcs*sizeof(uint32_t));
+		res.crtc_id_ptr = VOID2U64(drmMalloc(res.count_crtcs*sizeof(uint32_t)));
 	if (res.count_outputs)
-		res.output_id = drmMalloc(res.count_outputs*sizeof(uint32_t));
+		res.output_id_ptr = VOID2U64(drmMalloc(res.count_outputs*sizeof(uint32_t)));
 
 	if (ioctl(fd, DRM_IOCTL_MODE_GETRESOURCES, &res)) {
 		r = NULL;
@@ -168,18 +171,22 @@ drmModeResPtr drmModeGetResources(int fd)
 	if (!(r = drmMalloc(sizeof(*r))))
 		return 0;
 
+	r->min_width     = res.min_width;
+	r->max_width     = res.max_width;
+	r->min_height    = res.min_height;
+	r->max_height    = res.max_height;
 	r->count_fbs     = res.count_fbs;
 	r->count_crtcs   = res.count_crtcs;
 	r->count_outputs = res.count_outputs;
 	/* TODO we realy should test if these allocs fails. */
-	r->fbs           = drmAllocCpy(res.fb_id, res.count_fbs, sizeof(uint32_t));
-	r->crtcs         = drmAllocCpy(res.crtc_id, res.count_crtcs, sizeof(uint32_t));
-	r->outputs       = drmAllocCpy(res.output_id, res.count_outputs, sizeof(uint32_t));
+	r->fbs           = drmAllocCpy(U642VOID(res.fb_id_ptr), res.count_fbs, sizeof(uint32_t));
+	r->crtcs         = drmAllocCpy(U642VOID(res.crtc_id_ptr), res.count_crtcs, sizeof(uint32_t));
+	r->outputs       = drmAllocCpy(U642VOID(res.output_id_ptr), res.count_outputs, sizeof(uint32_t));
 
 err_allocs:
-	drmFree(res.fb_id);
-	drmFree(res.crtc_id);
-	drmFree(res.output_id);
+	drmFree(U642VOID(res.fb_id_ptr));
+	drmFree(U642VOID(res.crtc_id_ptr));
+	drmFree(U642VOID(res.output_id_ptr));
 
 	return r;
 }
@@ -297,7 +304,7 @@ int drmModeSetCrtc(int fd, uint32_t crtcId, uint32_t bufferId,
 	crtc.y             = y;
 	crtc.crtc_id       = crtcId;
 	crtc.fb_id         = bufferId;
-	crtc.set_outputs   = outputs;
+	crtc.set_outputs_ptr = VOID2U64(outputs);
 	crtc.count_outputs = count;
 	if (mode) {
 	  memcpy(&crtc.mode, mode, sizeof(struct drm_mode_modeinfo));
@@ -324,21 +331,21 @@ drmModeOutputPtr drmModeGetOutput(int fd, uint32_t output_id)
 	out.count_clones = 0;
 	out.clones       = 0;
 	out.count_modes  = 0;
-	out.modes        = 0;
+	out.modes_ptr    = 0;
 	out.count_props  = 0;
-	out.props = NULL;
-	out.prop_values = NULL;
+	out.props_ptr    = 0;
+	out.prop_values_ptr = 0;
 
 	if (ioctl(fd, DRM_IOCTL_MODE_GETOUTPUT, &out))
 		return 0;
 
 	if (out.count_props) {
-		out.props = drmMalloc(out.count_props*sizeof(uint32_t));
-		out.prop_values = drmMalloc(out.count_props*sizeof(uint32_t));
+		out.props_ptr = VOID2U64(drmMalloc(out.count_props*sizeof(uint32_t)));
+		out.prop_values_ptr = VOID2U64(drmMalloc(out.count_props*sizeof(uint64_t)));
 	}
 
 	if (out.count_modes)
-		out.modes = drmMalloc(out.count_modes*sizeof(struct drm_mode_modeinfo));
+		out.modes_ptr = VOID2U64(drmMalloc(out.count_modes*sizeof(struct drm_mode_modeinfo)));
 
 	if (ioctl(fd, DRM_IOCTL_MODE_GETOUTPUT, &out))
 		goto err_allocs;
@@ -360,16 +367,16 @@ drmModeOutputPtr drmModeGetOutput(int fd, uint32_t output_id)
 	r->crtcs        = out.crtcs;
 	r->clones       = out.clones;
 	r->count_props  = out.count_props;
-	r->props        = drmAllocCpy(out.props, out.count_props, sizeof(uint32_t));
-	r->prop_values  = drmAllocCpy(out.prop_values, out.count_props, sizeof(uint32_t));
-	r->modes        = drmAllocCpy(out.modes, out.count_modes, sizeof(struct drm_mode_modeinfo));
+	r->props        = drmAllocCpy(U642VOID(out.props_ptr), out.count_props, sizeof(uint32_t));
+	r->prop_values  = drmAllocCpy(U642VOID(out.prop_values_ptr), out.count_props, sizeof(uint64_t));
+	r->modes        = drmAllocCpy(U642VOID(out.modes_ptr), out.count_modes, sizeof(struct drm_mode_modeinfo));
 	strncpy(r->name, out.name, DRM_OUTPUT_NAME_LEN);
 	r->name[DRM_OUTPUT_NAME_LEN-1] = 0;
 
 err_allocs:
-	drmFree(out.prop_values);
-	drmFree(out.props);
-	drmFree(out.modes);
+	drmFree(U642VOID(out.prop_values_ptr));
+	drmFree(U642VOID(out.props_ptr));
+	drmFree(U642VOID(out.modes_ptr));
 
 	return r;
 }
@@ -401,20 +408,20 @@ drmModePropertyPtr drmModeGetProperty(int fd, uint32_t property_id)
 	drmModePropertyPtr r;
 
 	prop.prop_id = property_id;
-	prop.count_enums = 0;
+	prop.count_enum_blobs = 0;
 	prop.count_values = 0;
 	prop.flags = 0;
-	prop.enums = NULL;
-	prop.values = NULL;
+	prop.enum_blob_ptr = 0;
+	prop.values_ptr = 0;
 
 	if (ioctl(fd, DRM_IOCTL_MODE_GETPROPERTY, &prop))
 		return 0;
 
 	if (prop.count_values)
-		prop.values = drmMalloc(prop.count_values * sizeof(uint32_t));
+		prop.values_ptr = VOID2U64(drmMalloc(prop.count_values * sizeof(uint64_t)));
 
-	if (prop.count_enums)
-		prop.enums = drmMalloc(prop.count_enums * sizeof(struct drm_mode_property_enum));
+	if (prop.count_enum_blobs)
+		prop.enum_blob_ptr = VOID2U64(drmMalloc(prop.count_enum_blobs * sizeof(struct drm_mode_property_enum)));
 
 	if (ioctl(fd, DRM_IOCTL_MODE_GETPROPERTY, &prop)) {
 		r = NULL;
@@ -426,16 +433,16 @@ drmModePropertyPtr drmModeGetProperty(int fd, uint32_t property_id)
 	
 	r->prop_id = prop.prop_id;
 	r->count_values = prop.count_values;
-	r->count_enums = prop.count_enums;
-
-	r->values = drmAllocCpy(prop.values, prop.count_values, sizeof(uint32_t));
-	r->enums = drmAllocCpy(prop.enums, prop.count_enums, sizeof(struct drm_mode_property_enum));
+	r->count_enums = prop.count_enum_blobs;
+	r->flags = prop.flags;
+	r->values = drmAllocCpy(U642VOID(prop.values_ptr), prop.count_values, sizeof(uint64_t));
+	r->enums = drmAllocCpy(U642VOID(prop.enum_blob_ptr), prop.count_enum_blobs, sizeof(struct drm_mode_property_enum));
 	strncpy(r->name, prop.name, DRM_PROP_NAME_LEN);
 	r->name[DRM_PROP_NAME_LEN-1] = 0;
 
 err_allocs:
-	drmFree(prop.values);
-	drmFree(prop.enums);
+	drmFree(U642VOID(prop.values_ptr));
+	drmFree(U642VOID(prop.enum_blob_ptr));
 
 	return r;
 }
-- 
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.c | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

(limited to 'libdrm/xf86drmMode.c')

diff --git a/libdrm/xf86drmMode.c b/libdrm/xf86drmMode.c
index e5191d8c..f4ec004c 100644
--- a/libdrm/xf86drmMode.c
+++ b/libdrm/xf86drmMode.c
@@ -406,7 +406,8 @@ drmModePropertyPtr drmModeGetProperty(int fd, uint32_t property_id)
 {
 	struct drm_mode_get_property prop;
 	drmModePropertyPtr r;
-
+	struct drm_mode_property_blob *blob_tmp;
+	int i;
 	prop.prop_id = property_id;
 	prop.count_enum_blobs = 0;
 	prop.count_values = 0;
@@ -420,9 +421,14 @@ drmModePropertyPtr drmModeGetProperty(int fd, uint32_t property_id)
 	if (prop.count_values)
 		prop.values_ptr = VOID2U64(drmMalloc(prop.count_values * sizeof(uint64_t)));
 
-	if (prop.count_enum_blobs)
+	if (prop.count_enum_blobs & (prop.flags & DRM_MODE_PROP_ENUM))
 		prop.enum_blob_ptr = VOID2U64(drmMalloc(prop.count_enum_blobs * sizeof(struct drm_mode_property_enum)));
 
+	if (prop.count_enum_blobs & (prop.flags & DRM_MODE_PROP_BLOB)) {
+		prop.values_ptr = VOID2U64(drmMalloc(prop.count_enum_blobs * sizeof(uint32_t)));
+		prop.enum_blob_ptr = VOID2U64(drmMalloc(prop.count_enum_blobs * sizeof(uint32_t)));
+	}
+
 	if (ioctl(fd, DRM_IOCTL_MODE_GETPROPERTY, &prop)) {
 		r = NULL;
 		goto err_allocs;
@@ -433,10 +439,18 @@ drmModePropertyPtr drmModeGetProperty(int fd, uint32_t property_id)
 	
 	r->prop_id = prop.prop_id;
 	r->count_values = prop.count_values;
-	r->count_enums = prop.count_enum_blobs;
+	
 	r->flags = prop.flags;
-	r->values = drmAllocCpy(U642VOID(prop.values_ptr), prop.count_values, sizeof(uint64_t));
-	r->enums = drmAllocCpy(U642VOID(prop.enum_blob_ptr), prop.count_enum_blobs, sizeof(struct drm_mode_property_enum));
+	if (prop.count_values)
+		r->values = drmAllocCpy(U642VOID(prop.values_ptr), prop.count_values, sizeof(uint64_t));
+	if (prop.flags & DRM_MODE_PROP_ENUM) {
+		r->count_enums = prop.count_enum_blobs;
+		r->enums = drmAllocCpy(U642VOID(prop.enum_blob_ptr), prop.count_enum_blobs, sizeof(struct drm_mode_property_enum));
+	} else	if (prop.flags & DRM_MODE_PROP_ENUM) {
+		r->values = drmAllocCpy(U642VOID(prop.values_ptr), prop.count_enum_blobs, sizeof(uint32_t));
+		r->blob_ids = drmAllocCpy(U642VOID(prop.enum_blob_ptr), prop.count_enum_blobs, sizeof(uint32_t));
+		r->count_blobs = prop.count_enum_blobs;
+	}
 	strncpy(r->name, prop.name, DRM_PROP_NAME_LEN);
 	r->name[DRM_PROP_NAME_LEN-1] = 0;
 
-- 
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.c | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

(limited to 'libdrm/xf86drmMode.c')

diff --git a/libdrm/xf86drmMode.c b/libdrm/xf86drmMode.c
index f4ec004c..03bd15f1 100644
--- a/libdrm/xf86drmMode.c
+++ b/libdrm/xf86drmMode.c
@@ -470,3 +470,44 @@ void drmModeFreeProperty(drmModePropertyPtr ptr)
 	drmFree(ptr->enums);
 	drmFree(ptr);
 }
+
+drmModePropertyBlobPtr drmModeGetPropertyBlob(int fd, uint32_t blob_id)
+{
+	struct drm_mode_get_blob blob;
+	drmModePropertyBlobPtr r;
+
+	blob.length = 0;
+	blob.data = 0;
+	blob.blob_id = blob_id;
+
+	if (ioctl(fd, DRM_IOCTL_MODE_GETPROPBLOB, &blob))
+		return NULL;
+
+	if (blob.length)
+		blob.data = VOID2U64(drmMalloc(blob.length));
+
+	if (ioctl(fd, DRM_IOCTL_MODE_GETPROPBLOB, &blob)) {
+		r = NULL;
+		goto err_allocs;
+	}
+
+	if (!(r = drmMalloc(sizeof(*r))))
+		return NULL;
+
+	r->id = blob.blob_id;
+	r->length = blob.length;
+	r->data = drmAllocCpy(U642VOID(blob.data), 1, blob.length);
+
+err_allocs:
+	drmFree(U642VOID(blob.data));
+	return r;
+}
+
+void drmModeFreePropertyBlob(drmModePropertyBlobPtr ptr)
+{
+	if (!ptr)
+		return;
+
+	drmFree(ptr->data);
+	drmFree(ptr);
+}
-- 
cgit v1.2.3


From 3b6786e3e6523b1ceca3645ea4c6081f170d2134 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Tue, 11 Dec 2007 14:46:51 +1000
Subject: modesetting: add dpms property and initial settable property ioctl

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

(limited to 'libdrm/xf86drmMode.c')

diff --git a/libdrm/xf86drmMode.c b/libdrm/xf86drmMode.c
index 03bd15f1..7e2683ea 100644
--- a/libdrm/xf86drmMode.c
+++ b/libdrm/xf86drmMode.c
@@ -421,10 +421,10 @@ drmModePropertyPtr drmModeGetProperty(int fd, uint32_t property_id)
 	if (prop.count_values)
 		prop.values_ptr = VOID2U64(drmMalloc(prop.count_values * sizeof(uint64_t)));
 
-	if (prop.count_enum_blobs & (prop.flags & DRM_MODE_PROP_ENUM))
+	if (prop.count_enum_blobs && (prop.flags & DRM_MODE_PROP_ENUM))
 		prop.enum_blob_ptr = VOID2U64(drmMalloc(prop.count_enum_blobs * sizeof(struct drm_mode_property_enum)));
 
-	if (prop.count_enum_blobs & (prop.flags & DRM_MODE_PROP_BLOB)) {
+	if (prop.count_enum_blobs && (prop.flags & DRM_MODE_PROP_BLOB)) {
 		prop.values_ptr = VOID2U64(drmMalloc(prop.count_enum_blobs * sizeof(uint32_t)));
 		prop.enum_blob_ptr = VOID2U64(drmMalloc(prop.count_enum_blobs * sizeof(uint32_t)));
 	}
-- 
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.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'libdrm/xf86drmMode.c')

diff --git a/libdrm/xf86drmMode.c b/libdrm/xf86drmMode.c
index 7e2683ea..726c55ab 100644
--- a/libdrm/xf86drmMode.c
+++ b/libdrm/xf86drmMode.c
@@ -214,6 +214,8 @@ int drmModeAddFB(int fd, uint32_t width, uint32_t height, uint8_t depth,
 int drmModeRmFB(int fd, uint32_t bufferId)
 {
 	return ioctl(fd, DRM_IOCTL_MODE_RMFB, &bufferId);
+
+
 }
 
 drmModeFBPtr drmModeGetFB(int fd, uint32_t buf)
@@ -511,3 +513,19 @@ void drmModeFreePropertyBlob(drmModePropertyBlobPtr ptr)
 	drmFree(ptr->data);
 	drmFree(ptr);
 }
+
+int drmModeOutputSetProperty(int fd, uint32_t output_id, uint32_t property_id,
+			     uint64_t value)
+{
+	struct drm_mode_output_set_property osp;
+	int ret;
+
+	osp.output_id = output_id;
+	osp.prop_id = property_id;
+	osp.value = value;
+
+	if (ret = ioctl(fd, DRM_IOCTL_MODE_SETPROPERTY, &osp))
+		return ret;
+
+	return 0;
+}
-- 
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.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'libdrm/xf86drmMode.c')

diff --git a/libdrm/xf86drmMode.c b/libdrm/xf86drmMode.c
index 726c55ab..0edb1d7d 100644
--- a/libdrm/xf86drmMode.c
+++ b/libdrm/xf86drmMode.c
@@ -328,6 +328,8 @@ drmModeOutputPtr drmModeGetOutput(int fd, uint32_t output_id)
 	drmModeOutputPtr r = NULL;
 
 	out.output = output_id;
+	out.output_type_id = 0;
+	out.output_type  = 0;
 	out.count_crtcs  = 0;
 	out.crtcs        = 0;
 	out.count_clones = 0;
@@ -372,8 +374,8 @@ drmModeOutputPtr drmModeGetOutput(int fd, uint32_t output_id)
 	r->props        = drmAllocCpy(U642VOID(out.props_ptr), out.count_props, sizeof(uint32_t));
 	r->prop_values  = drmAllocCpy(U642VOID(out.prop_values_ptr), out.count_props, sizeof(uint64_t));
 	r->modes        = drmAllocCpy(U642VOID(out.modes_ptr), out.count_modes, sizeof(struct drm_mode_modeinfo));
-	strncpy(r->name, out.name, DRM_OUTPUT_NAME_LEN);
-	r->name[DRM_OUTPUT_NAME_LEN-1] = 0;
+	r->output_type  = out.output_type;
+	r->output_type_id = out.output_type_id;
 
 err_allocs:
 	drmFree(U642VOID(out.prop_values_ptr));
-- 
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.c | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

(limited to 'libdrm/xf86drmMode.c')

diff --git a/libdrm/xf86drmMode.c b/libdrm/xf86drmMode.c
index 0edb1d7d..86572872 100644
--- a/libdrm/xf86drmMode.c
+++ b/libdrm/xf86drmMode.c
@@ -317,6 +317,34 @@ int drmModeSetCrtc(int fd, uint32_t crtcId, uint32_t bufferId,
 	return ioctl(fd, DRM_IOCTL_MODE_SETCRTC, &crtc);
 }
 
+/*
+ * Cursor manipulation
+ */
+
+int drmModeSetCursor(int fd, uint32_t crtcId, drmBO *bo, uint32_t width, uint32_t height)
+{
+	struct drm_mode_cursor arg;
+
+	arg.flags = DRM_MODE_CURSOR_BO;
+	arg.crtc = crtcId;
+	arg.width = width;
+	arg.height = height;
+	arg.handle = bo->handle;
+
+	return ioctl(fd, DRM_IOCTL_MODE_CURSOR, &arg);
+}
+
+int drmModeMoveCursor(int fd, uint32_t crtcId, int x, int y)
+{
+	struct drm_mode_cursor arg;
+
+	arg.flags = DRM_MODE_CURSOR_MOVE;
+	arg.crtc = crtcId;
+	arg.x = x;
+	arg.y = y;
+
+	return ioctl(fd, DRM_IOCTL_MODE_CURSOR, &arg);
+}
 
 /*
  * Output manipulation
-- 
cgit v1.2.3


From 841ef9eb8da8058d6495e9f8e1b14af2709dfaa1 Mon Sep 17 00:00:00 2001
From: Jakob Bornecrantz <jakob@aurora.(none)>
Date: Wed, 30 Jan 2008 15:47:26 +0100
Subject: ModeFB demo now display cursor

---
 libdrm/xf86drmMode.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'libdrm/xf86drmMode.c')

diff --git a/libdrm/xf86drmMode.c b/libdrm/xf86drmMode.c
index 86572872..681ad417 100644
--- a/libdrm/xf86drmMode.c
+++ b/libdrm/xf86drmMode.c
@@ -329,7 +329,10 @@ int drmModeSetCursor(int fd, uint32_t crtcId, drmBO *bo, uint32_t width, uint32_
 	arg.crtc = crtcId;
 	arg.width = width;
 	arg.height = height;
-	arg.handle = bo->handle;
+	if (bo)
+		arg.handle = bo->handle;
+	else
+		arg.handle = 0;
 
 	return ioctl(fd, DRM_IOCTL_MODE_CURSOR, &arg);
 }
-- 
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.c | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'libdrm/xf86drmMode.c')

diff --git a/libdrm/xf86drmMode.c b/libdrm/xf86drmMode.c
index 681ad417..52fef81b 100644
--- a/libdrm/xf86drmMode.c
+++ b/libdrm/xf86drmMode.c
@@ -191,6 +191,15 @@ err_allocs:
 	return r;
 }
 
+uint32_t drmModeGetHotplug(int fd)
+{
+	struct drm_mode_hotplug arg;
+	arg.counter = 0;
+
+	ioctl(fd, DRM_IOCTL_MODE_HOTPLUG, &arg);
+	return arg.counter;
+}
+
 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)
 {
-- 
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.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

(limited to 'libdrm/xf86drmMode.c')

diff --git a/libdrm/xf86drmMode.c b/libdrm/xf86drmMode.c
index 52fef81b..717e1fe2 100644
--- a/libdrm/xf86drmMode.c
+++ b/libdrm/xf86drmMode.c
@@ -41,6 +41,8 @@
 #include "xf86drm.h"
 #include <drm.h>
 #include <string.h>
+#include <dirent.h>
+#include <errno.h>
 
 #define U642VOID(x) ((void *)(unsigned long)(x))
 #define VOID2U64(x) ((uint64_t)(unsigned long)(x))
@@ -571,3 +573,49 @@ int drmModeOutputSetProperty(int fd, uint32_t output_id, uint32_t property_id,
 
 	return 0;
 }
+
+/*
+ * checks if a modesetting capable driver has attached to the pci id
+ * returns 0 if modesetting supported.
+ *  -EINVAL or invalid bus id
+ *  -ENOSYS if no modesetting support
+*/
+int drmCheckModesettingSupported(const char *busid)
+{
+#ifdef __linux__
+	char pci_dev_dir[1024];
+	char *bus_id_path;
+	char *bus_type;
+	int domain, bus, dev, func;
+	DIR *sysdir;
+	struct dirent *dent;
+	int found = 0, ret;
+
+	ret = sscanf(busid, "pci:%04x:%02x:%02x.%d", &domain, &bus, &dev, &func);
+	if (ret != 4)
+		return -EINVAL;
+
+	sprintf(pci_dev_dir, "/sys/bus/pci/devices/%04x:%02x:%02x.%d/",
+		domain, bus, dev, func);
+
+	sysdir = opendir(pci_dev_dir);
+	if (!sysdir)
+		return -EINVAL;
+
+	dent = readdir(sysdir);
+	while (dent) {
+		if (!strncmp(dent->d_name, "drm:controlD", 12)) {
+			found = 1;
+			break;
+		}
+		
+		dent = readdir(sysdir);
+	}
+			
+	closedir(sysdir);
+	if (found)
+		return 0;
+#endif
+	return -ENOSYS;
+
+}
-- 
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.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'libdrm/xf86drmMode.c')

diff --git a/libdrm/xf86drmMode.c b/libdrm/xf86drmMode.c
index 717e1fe2..dd1a6ca9 100644
--- a/libdrm/xf86drmMode.c
+++ b/libdrm/xf86drmMode.c
@@ -203,7 +203,8 @@ uint32_t drmModeGetHotplug(int fd)
 }
 
 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, uint32_t bo_handle,
+		 uint32_t *buf_id)
 {
 	struct drm_mode_fb_cmd f;
 	int ret;
@@ -213,7 +214,7 @@ int drmModeAddFB(int fd, uint32_t width, uint32_t height, uint8_t depth,
 	f.pitch  = pitch;
 	f.bpp    = bpp;
 	f.depth  = depth;
-	f.handle = bo->handle;
+	f.handle = bo_handle;
 
 	if (ret = ioctl(fd, DRM_IOCTL_MODE_ADDFB, &f))
 		return ret;
-- 
cgit v1.2.3


From 81db48536c9d7bb23c448af6a6f1de81df755585 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@panoply-rh.(none)>
Date: Wed, 5 Mar 2008 10:31:43 +1000
Subject: remove unused functions + include header file

---
 libdrm/xf86drmMode.c | 22 +---------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

(limited to 'libdrm/xf86drmMode.c')

diff --git a/libdrm/xf86drmMode.c b/libdrm/xf86drmMode.c
index dd1a6ca9..30b434de 100644
--- a/libdrm/xf86drmMode.c
+++ b/libdrm/xf86drmMode.c
@@ -36,6 +36,7 @@
  * platforms find which headers to include to get uint32_t
  */
 #include <stdint.h>
+#include <sys/ioctl.h>
 
 #include "xf86drmMode.h"
 #include "xf86drm.h"
@@ -68,27 +69,6 @@ void* drmAllocCpy(void *array, int count, int entry_size)
 	return r;
 }
 
-/**
- * Generate crtc and output ids.
- *
- * Will generate ids starting from 1 up to count if count is greater then 0.
- */
-static uint32_t* drmAllocGenerate(int count)
-{
-	uint32_t *r;
-	int i;
-
-	if(0 <= count)
-		return 0;
-
-	if (!(r = drmMalloc(count*sizeof(*r))))
-		return 0;
-
-	for (i = 0; i < count; r[i] = ++i);
-
-	return 0;
-}
-
 /*
  * A couple of free functions.
  */
-- 
cgit v1.2.3


From 4aa7efe398911bd58fb348703444a92114e45114 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@panoply-rh.(none)>
Date: Wed, 5 Mar 2008 10:41:54 +1000
Subject: libdrm: fix warnings in mode code

---
 libdrm/xf86drmMode.c | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

(limited to 'libdrm/xf86drmMode.c')

diff --git a/libdrm/xf86drmMode.c b/libdrm/xf86drmMode.c
index 30b434de..07b14dbf 100644
--- a/libdrm/xf86drmMode.c
+++ b/libdrm/xf86drmMode.c
@@ -37,6 +37,7 @@
  */
 #include <stdint.h>
 #include <sys/ioctl.h>
+#include <stdio.h>
 
 #include "xf86drmMode.h"
 #include "xf86drm.h"
@@ -125,7 +126,6 @@ void drmModeFreeOutput(drmModeOutputPtr ptr)
 drmModeResPtr drmModeGetResources(int fd)
 {
 	struct drm_mode_card_res res;
-	int i;
 	drmModeResPtr r = 0;
 
 	memset(&res, 0, sizeof(struct drm_mode_card_res));
@@ -196,7 +196,7 @@ int drmModeAddFB(int fd, uint32_t width, uint32_t height, uint8_t depth,
 	f.depth  = depth;
 	f.handle = bo_handle;
 
-	if (ret = ioctl(fd, DRM_IOCTL_MODE_ADDFB, &f))
+	if ((ret = ioctl(fd, DRM_IOCTL_MODE_ADDFB, &f)))
 		return ret;
 
 	*buf_id = f.buffer_id;
@@ -243,7 +243,6 @@ drmModeCrtcPtr drmModeGetCrtc(int fd, uint32_t crtcId)
 {
 	struct drm_mode_crtc crtc;
 	drmModeCrtcPtr r;
-	int i = 0;
 
 	crtc.count_outputs   = 0;
 	crtc.outputs         = 0;
@@ -276,10 +275,6 @@ drmModeCrtcPtr drmModeGetCrtc(int fd, uint32_t crtcId)
 	r->possibles       = crtc.possibles;
 
 	return r;
-
-err_allocs:
-
-	return 0;
 }
 
 
@@ -433,8 +428,7 @@ drmModePropertyPtr drmModeGetProperty(int fd, uint32_t property_id)
 {
 	struct drm_mode_get_property prop;
 	drmModePropertyPtr r;
-	struct drm_mode_property_blob *blob_tmp;
-	int i;
+
 	prop.prop_id = property_id;
 	prop.count_enum_blobs = 0;
 	prop.count_values = 0;
@@ -549,7 +543,7 @@ int drmModeOutputSetProperty(int fd, uint32_t output_id, uint32_t property_id,
 	osp.prop_id = property_id;
 	osp.value = value;
 
-	if (ret = ioctl(fd, DRM_IOCTL_MODE_SETPROPERTY, &osp))
+	if ((ret = ioctl(fd, DRM_IOCTL_MODE_SETPROPERTY, &osp)))
 		return ret;
 
 	return 0;
@@ -565,8 +559,6 @@ int drmCheckModesettingSupported(const char *busid)
 {
 #ifdef __linux__
 	char pci_dev_dir[1024];
-	char *bus_id_path;
-	char *bus_type;
 	int domain, bus, dev, func;
 	DIR *sysdir;
 	struct dirent *dent;
-- 
cgit v1.2.3


From add7d21c79e2bd2012d92bb0043023230ec9aa74 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Fri, 7 Mar 2008 08:56:20 +1000
Subject: drm: fixup for new sysfs API

---
 libdrm/xf86drmMode.c | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'libdrm/xf86drmMode.c')

diff --git a/libdrm/xf86drmMode.c b/libdrm/xf86drmMode.c
index 07b14dbf..f86cc48f 100644
--- a/libdrm/xf86drmMode.c
+++ b/libdrm/xf86drmMode.c
@@ -568,6 +568,25 @@ int drmCheckModesettingSupported(const char *busid)
 	if (ret != 4)
 		return -EINVAL;
 
+	sprintf(pci_dev_dir, "/sys/bus/pci/devices/%04x:%02x:%02x.%d/drm",
+		domain, bus, dev, func);
+
+	sysdir = opendir(pci_dev_dir);
+	if (sysdir) {
+		dent = readdir(sysdir);
+		while (dent) {
+			if (!strncmp(dent->d_name, "controlD", 8)) {
+				found = 1;
+				break;
+			}
+		
+			dent = readdir(sysdir);
+		}
+		closedir(sysdir);
+		if (found)
+			return 0;
+	}
+
 	sprintf(pci_dev_dir, "/sys/bus/pci/devices/%04x:%02x:%02x.%d/",
 		domain, bus, dev, func);
 
-- 
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.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'libdrm/xf86drmMode.c')

diff --git a/libdrm/xf86drmMode.c b/libdrm/xf86drmMode.c
index f86cc48f..605377dd 100644
--- a/libdrm/xf86drmMode.c
+++ b/libdrm/xf86drmMode.c
@@ -308,7 +308,7 @@ int drmModeSetCrtc(int fd, uint32_t crtcId, uint32_t bufferId,
  * Cursor manipulation
  */
 
-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)
 {
 	struct drm_mode_cursor arg;
 
@@ -316,10 +316,7 @@ int drmModeSetCursor(int fd, uint32_t crtcId, drmBO *bo, uint32_t width, uint32_
 	arg.crtc = crtcId;
 	arg.width = width;
 	arg.height = height;
-	if (bo)
-		arg.handle = bo->handle;
-	else
-		arg.handle = 0;
+	arg.handle = bo_handle;
 
 	return ioctl(fd, DRM_IOCTL_MODE_CURSOR, &arg);
 }
-- 
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.c | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

(limited to 'libdrm/xf86drmMode.c')

diff --git a/libdrm/xf86drmMode.c b/libdrm/xf86drmMode.c
index 605377dd..ae15fd65 100644
--- a/libdrm/xf86drmMode.c
+++ b/libdrm/xf86drmMode.c
@@ -608,3 +608,24 @@ int drmCheckModesettingSupported(const char *busid)
 	return -ENOSYS;
 
 }
+
+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)
+{
+	struct drm_mode_fb_cmd f;
+	int ret;
+
+	f.width = width;
+	f.height = height;
+	f.pitch = pitch;
+	f.bpp = bpp;
+	f.depth = depth;
+	f.handle = bo_handle;
+	f.buffer_id = buffer_id;
+
+	if ((ret = ioctl(fd, DRM_IOCTL_MODE_REPLACEFB, &f)))
+		return ret;
+
+	return 0;
+}
-- 
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.c | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

(limited to 'libdrm/xf86drmMode.c')

diff --git a/libdrm/xf86drmMode.c b/libdrm/xf86drmMode.c
index ae15fd65..e5798f96 100644
--- a/libdrm/xf86drmMode.c
+++ b/libdrm/xf86drmMode.c
@@ -139,6 +139,8 @@ drmModeResPtr drmModeGetResources(int fd)
 		res.crtc_id_ptr = VOID2U64(drmMalloc(res.count_crtcs*sizeof(uint32_t)));
 	if (res.count_outputs)
 		res.output_id_ptr = VOID2U64(drmMalloc(res.count_outputs*sizeof(uint32_t)));
+	if (res.count_encoders)
+		res.encoder_id_ptr = VOID2U64(drmMalloc(res.count_encoders*sizeof(uint32_t)));
 
 	if (ioctl(fd, DRM_IOCTL_MODE_GETRESOURCES, &res)) {
 		r = NULL;
@@ -164,11 +166,13 @@ drmModeResPtr drmModeGetResources(int fd)
 	r->fbs           = drmAllocCpy(U642VOID(res.fb_id_ptr), res.count_fbs, sizeof(uint32_t));
 	r->crtcs         = drmAllocCpy(U642VOID(res.crtc_id_ptr), res.count_crtcs, sizeof(uint32_t));
 	r->outputs       = drmAllocCpy(U642VOID(res.output_id_ptr), res.count_outputs, sizeof(uint32_t));
+	r->encoders      = drmAllocCpy(U642VOID(res.encoder_id_ptr), res.count_encoders, sizeof(uint32_t));
 
 err_allocs:
 	drmFree(U642VOID(res.fb_id_ptr));
 	drmFree(U642VOID(res.crtc_id_ptr));
 	drmFree(U642VOID(res.output_id_ptr));
+	drmFree(U642VOID(res.encoder_id_ptr));
 
 	return r;
 }
@@ -333,6 +337,29 @@ int drmModeMoveCursor(int fd, uint32_t crtcId, int x, int y)
 	return ioctl(fd, DRM_IOCTL_MODE_CURSOR, &arg);
 }
 
+/*
+ * Encoder get 
+ */
+drmModeEncoderPtr drmModeGetEncoder(int fd, uint32_t encoder_id)
+{
+	struct drm_mode_get_encoder enc;
+	drmModeEncoderPtr r = NULL;
+
+	enc.encoder_id = encoder_id;
+	enc.encoder_type = 0;
+	enc.crtcs = 0;
+	enc.clones = 0;
+
+	if (ioctl(fd, DRM_IOCTL_MODE_GETENCODER, &enc))
+		return 0;
+
+	r->encoder_type = enc.encoder_type;
+	r->crtcs = enc.crtcs;
+	r->clones = enc.clones;
+
+	return r;
+}
+
 /*
  * 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.c | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'libdrm/xf86drmMode.c')

diff --git a/libdrm/xf86drmMode.c b/libdrm/xf86drmMode.c
index e5798f96..672a5e2a 100644
--- a/libdrm/xf86drmMode.c
+++ b/libdrm/xf86drmMode.c
@@ -381,6 +381,8 @@ drmModeOutputPtr drmModeGetOutput(int fd, uint32_t output_id)
 	out.count_props  = 0;
 	out.props_ptr    = 0;
 	out.prop_values_ptr = 0;
+	out.count_encoders  = 0;
+	out.encoders_ptr = 0;
 
 	if (ioctl(fd, DRM_IOCTL_MODE_GETOUTPUT, &out))
 		return 0;
@@ -393,6 +395,9 @@ drmModeOutputPtr drmModeGetOutput(int fd, uint32_t output_id)
 	if (out.count_modes)
 		out.modes_ptr = VOID2U64(drmMalloc(out.count_modes*sizeof(struct drm_mode_modeinfo)));
 
+	if (out.count_encoders)
+		out.encoders_ptr = VOID2U64(drmMalloc(out.count_encoders*sizeof(uint32_t)));
+
 	if (ioctl(fd, DRM_IOCTL_MODE_GETOUTPUT, &out))
 		goto err_allocs;
 
@@ -416,6 +421,8 @@ drmModeOutputPtr drmModeGetOutput(int fd, uint32_t output_id)
 	r->props        = drmAllocCpy(U642VOID(out.props_ptr), out.count_props, sizeof(uint32_t));
 	r->prop_values  = drmAllocCpy(U642VOID(out.prop_values_ptr), out.count_props, sizeof(uint64_t));
 	r->modes        = drmAllocCpy(U642VOID(out.modes_ptr), out.count_modes, sizeof(struct drm_mode_modeinfo));
+	r->count_encoders = out.count_encoders;
+	r->encoders     = drmAllocCpy(U642VOID(out.encoders_ptr), out.count_encoders, sizeof(uint32_t));
 	r->output_type  = out.output_type;
 	r->output_type_id = out.output_type_id;
 
@@ -423,6 +430,7 @@ err_allocs:
 	drmFree(U642VOID(out.prop_values_ptr));
 	drmFree(U642VOID(out.props_ptr));
 	drmFree(U642VOID(out.modes_ptr));
+	drmFree(U642VOID(out.encoders_ptr));
 
 	return r;
 }
-- 
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.c | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'libdrm/xf86drmMode.c')

diff --git a/libdrm/xf86drmMode.c b/libdrm/xf86drmMode.c
index 672a5e2a..78efe827 100644
--- a/libdrm/xf86drmMode.c
+++ b/libdrm/xf86drmMode.c
@@ -119,6 +119,11 @@ void drmModeFreeOutput(drmModeOutputPtr ptr)
 
 }
 
+void drmModeFreeEncoder(drmModeEncoderPtr ptr)
+{
+	drmFree(ptr);
+}
+
 /*
  * ModeSetting functions.
  */
-- 
cgit v1.2.3


From 1c4b25a2b1c31df190eab173128702d1b5871906 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Fri, 30 May 2008 13:49:39 +1000
Subject: drm: fix a couple of bugs in the encoder return to userspace

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

(limited to 'libdrm/xf86drmMode.c')

diff --git a/libdrm/xf86drmMode.c b/libdrm/xf86drmMode.c
index 78efe827..0824ec3f 100644
--- a/libdrm/xf86drmMode.c
+++ b/libdrm/xf86drmMode.c
@@ -167,6 +167,7 @@ drmModeResPtr drmModeGetResources(int fd)
 	r->count_fbs     = res.count_fbs;
 	r->count_crtcs   = res.count_crtcs;
 	r->count_outputs = res.count_outputs;
+	r->count_encoders = res.count_encoders;
 	/* TODO we realy should test if these allocs fails. */
 	r->fbs           = drmAllocCpy(U642VOID(res.fb_id_ptr), res.count_fbs, sizeof(uint32_t));
 	r->crtcs         = drmAllocCpy(U642VOID(res.crtc_id_ptr), res.count_crtcs, sizeof(uint32_t));
@@ -358,6 +359,9 @@ drmModeEncoderPtr drmModeGetEncoder(int fd, uint32_t encoder_id)
 	if (ioctl(fd, DRM_IOCTL_MODE_GETENCODER, &enc))
 		return 0;
 
+	if (!(r = drmMalloc(sizeof(*r))))
+		return 0;
+
 	r->encoder_type = enc.encoder_type;
 	r->crtcs = enc.crtcs;
 	r->clones = enc.clones;
-- 
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.c | 148 +++++++++++++++++++++++++--------------------------
 1 file changed, 74 insertions(+), 74 deletions(-)

(limited to 'libdrm/xf86drmMode.c')

diff --git a/libdrm/xf86drmMode.c b/libdrm/xf86drmMode.c
index 0824ec3f..a18c4290 100644
--- a/libdrm/xf86drmMode.c
+++ b/libdrm/xf86drmMode.c
@@ -109,7 +109,7 @@ void drmModeFreeCrtc(drmModeCrtcPtr ptr)
 
 }
 
-void drmModeFreeOutput(drmModeOutputPtr ptr)
+void drmModeFreeConnector(drmModeConnectorPtr ptr)
 {
 	if (!ptr)
 		return;
@@ -142,8 +142,8 @@ drmModeResPtr drmModeGetResources(int fd)
 		res.fb_id_ptr = VOID2U64(drmMalloc(res.count_fbs*sizeof(uint32_t)));
 	if (res.count_crtcs)
 		res.crtc_id_ptr = VOID2U64(drmMalloc(res.count_crtcs*sizeof(uint32_t)));
-	if (res.count_outputs)
-		res.output_id_ptr = VOID2U64(drmMalloc(res.count_outputs*sizeof(uint32_t)));
+	if (res.count_connectors)
+		res.connector_id_ptr = VOID2U64(drmMalloc(res.count_connectors*sizeof(uint32_t)));
 	if (res.count_encoders)
 		res.encoder_id_ptr = VOID2U64(drmMalloc(res.count_encoders*sizeof(uint32_t)));
 
@@ -166,18 +166,18 @@ drmModeResPtr drmModeGetResources(int fd)
 	r->max_height    = res.max_height;
 	r->count_fbs     = res.count_fbs;
 	r->count_crtcs   = res.count_crtcs;
-	r->count_outputs = res.count_outputs;
+	r->count_connectors = res.count_connectors;
 	r->count_encoders = res.count_encoders;
 	/* TODO we realy should test if these allocs fails. */
 	r->fbs           = drmAllocCpy(U642VOID(res.fb_id_ptr), res.count_fbs, sizeof(uint32_t));
 	r->crtcs         = drmAllocCpy(U642VOID(res.crtc_id_ptr), res.count_crtcs, sizeof(uint32_t));
-	r->outputs       = drmAllocCpy(U642VOID(res.output_id_ptr), res.count_outputs, sizeof(uint32_t));
+	r->connectors       = drmAllocCpy(U642VOID(res.connector_id_ptr), res.count_connectors, sizeof(uint32_t));
 	r->encoders      = drmAllocCpy(U642VOID(res.encoder_id_ptr), res.count_encoders, sizeof(uint32_t));
 
 err_allocs:
 	drmFree(U642VOID(res.fb_id_ptr));
 	drmFree(U642VOID(res.crtc_id_ptr));
-	drmFree(U642VOID(res.output_id_ptr));
+	drmFree(U642VOID(res.connector_id_ptr));
 	drmFree(U642VOID(res.encoder_id_ptr));
 
 	return r;
@@ -254,8 +254,8 @@ drmModeCrtcPtr drmModeGetCrtc(int fd, uint32_t crtcId)
 	struct drm_mode_crtc crtc;
 	drmModeCrtcPtr r;
 
-	crtc.count_outputs   = 0;
-	crtc.outputs         = 0;
+	crtc.count_connectors   = 0;
+	crtc.connectors         = 0;
 	crtc.count_possibles = 0;
 	crtc.possibles       = 0;
 	crtc.crtc_id = crtcId;
@@ -278,10 +278,10 @@ drmModeCrtcPtr drmModeGetCrtc(int fd, uint32_t crtcId)
 		memcpy(&r->mode, &crtc.mode, sizeof(struct drm_mode_modeinfo));
 	r->buffer_id       = crtc.fb_id;
 	r->gamma_size      = crtc.gamma_size;
-	r->count_outputs   = crtc.count_outputs;
+	r->count_connectors   = crtc.count_connectors;
 	r->count_possibles = crtc.count_possibles;
 	/* TODO we realy should test if these alloc & cpy fails. */
-	r->outputs         = crtc.outputs;
+	r->connectors         = crtc.connectors;
 	r->possibles       = crtc.possibles;
 
 	return r;
@@ -289,13 +289,13 @@ drmModeCrtcPtr drmModeGetCrtc(int fd, uint32_t crtcId)
 
 
 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)
 {
 	struct drm_mode_crtc crtc;
 
-	crtc.count_outputs   = 0;
-	crtc.outputs         = 0;
+	crtc.count_connectors   = 0;
+	crtc.connectors         = 0;
 	crtc.count_possibles = 0;
 	crtc.possibles       = 0;
 
@@ -303,8 +303,8 @@ int drmModeSetCrtc(int fd, uint32_t crtcId, uint32_t bufferId,
 	crtc.y             = y;
 	crtc.crtc_id       = crtcId;
 	crtc.fb_id         = bufferId;
-	crtc.set_outputs_ptr = VOID2U64(outputs);
-	crtc.count_outputs = count;
+	crtc.set_connectors_ptr = VOID2U64(connectors);
+	crtc.count_connectors = count;
 	if (mode) {
 	  memcpy(&crtc.mode, mode, sizeof(struct drm_mode_modeinfo));
 	  crtc.mode_valid = 1;
@@ -370,96 +370,96 @@ drmModeEncoderPtr drmModeGetEncoder(int fd, uint32_t encoder_id)
 }
 
 /*
- * Output manipulation
+ * Connector manipulation
  */
 
-drmModeOutputPtr drmModeGetOutput(int fd, uint32_t output_id)
+drmModeConnectorPtr drmModeGetConnector(int fd, uint32_t connector_id)
 {
-	struct drm_mode_get_output out;
-	drmModeOutputPtr r = NULL;
-
-	out.output = output_id;
-	out.output_type_id = 0;
-	out.output_type  = 0;
-	out.count_crtcs  = 0;
-	out.crtcs        = 0;
-	out.count_clones = 0;
-	out.clones       = 0;
-	out.count_modes  = 0;
-	out.modes_ptr    = 0;
-	out.count_props  = 0;
-	out.props_ptr    = 0;
-	out.prop_values_ptr = 0;
-	out.count_encoders  = 0;
-	out.encoders_ptr = 0;
-
-	if (ioctl(fd, DRM_IOCTL_MODE_GETOUTPUT, &out))
+	struct drm_mode_get_connector conn;
+	drmModeConnectorPtr r = NULL;
+
+	conn.connector = connector_id;
+	conn.connector_type_id = 0;
+	conn.connector_type  = 0;
+	conn.count_crtcs  = 0;
+	conn.crtcs        = 0;
+	conn.count_clones = 0;
+	conn.clones       = 0;
+	conn.count_modes  = 0;
+	conn.modes_ptr    = 0;
+	conn.count_props  = 0;
+	conn.props_ptr    = 0;
+	conn.prop_values_ptr = 0;
+	conn.count_encoders  = 0;
+	conn.encoders_ptr = 0;
+
+	if (ioctl(fd, DRM_IOCTL_MODE_GETCONNECTOR, &conn))
 		return 0;
 
-	if (out.count_props) {
-		out.props_ptr = VOID2U64(drmMalloc(out.count_props*sizeof(uint32_t)));
-		out.prop_values_ptr = VOID2U64(drmMalloc(out.count_props*sizeof(uint64_t)));
+	if (conn.count_props) {
+		conn.props_ptr = VOID2U64(drmMalloc(conn.count_props*sizeof(uint32_t)));
+		conn.prop_values_ptr = VOID2U64(drmMalloc(conn.count_props*sizeof(uint64_t)));
 	}
 
-	if (out.count_modes)
-		out.modes_ptr = VOID2U64(drmMalloc(out.count_modes*sizeof(struct drm_mode_modeinfo)));
+	if (conn.count_modes)
+		conn.modes_ptr = VOID2U64(drmMalloc(conn.count_modes*sizeof(struct drm_mode_modeinfo)));
 
-	if (out.count_encoders)
-		out.encoders_ptr = VOID2U64(drmMalloc(out.count_encoders*sizeof(uint32_t)));
+	if (conn.count_encoders)
+		conn.encoders_ptr = VOID2U64(drmMalloc(conn.count_encoders*sizeof(uint32_t)));
 
-	if (ioctl(fd, DRM_IOCTL_MODE_GETOUTPUT, &out))
+	if (ioctl(fd, DRM_IOCTL_MODE_GETCONNECTOR, &conn))
 		goto err_allocs;
 
 	if(!(r = drmMalloc(sizeof(*r)))) {
 		goto err_allocs;
 	}
 
-	r->output_id = out.output;
-	r->crtc = out.crtc;
-	r->connection   = out.connection;
-	r->mmWidth      = out.mm_width;
-	r->mmHeight     = out.mm_height;
-	r->subpixel     = out.subpixel;
-	r->count_crtcs  = out.count_crtcs;
-	r->count_clones = out.count_clones;
-	r->count_modes  = out.count_modes;
+	r->connector_id = conn.connector;
+	r->crtc = conn.crtc;
+	r->connection   = conn.connection;
+	r->mmWidth      = conn.mm_width;
+	r->mmHeight     = conn.mm_height;
+	r->subpixel     = conn.subpixel;
+	r->count_crtcs  = conn.count_crtcs;
+	r->count_clones = conn.count_clones;
+	r->count_modes  = conn.count_modes;
 	/* TODO we should test if these alloc & cpy fails. */
-	r->crtcs        = out.crtcs;
-	r->clones       = out.clones;
-	r->count_props  = out.count_props;
-	r->props        = drmAllocCpy(U642VOID(out.props_ptr), out.count_props, sizeof(uint32_t));
-	r->prop_values  = drmAllocCpy(U642VOID(out.prop_values_ptr), out.count_props, sizeof(uint64_t));
-	r->modes        = drmAllocCpy(U642VOID(out.modes_ptr), out.count_modes, sizeof(struct drm_mode_modeinfo));
-	r->count_encoders = out.count_encoders;
-	r->encoders     = drmAllocCpy(U642VOID(out.encoders_ptr), out.count_encoders, sizeof(uint32_t));
-	r->output_type  = out.output_type;
-	r->output_type_id = out.output_type_id;
+	r->crtcs        = conn.crtcs;
+	r->clones       = conn.clones;
+	r->count_props  = conn.count_props;
+	r->props        = drmAllocCpy(U642VOID(conn.props_ptr), conn.count_props, sizeof(uint32_t));
+	r->prop_values  = drmAllocCpy(U642VOID(conn.prop_values_ptr), conn.count_props, sizeof(uint64_t));
+	r->modes        = drmAllocCpy(U642VOID(conn.modes_ptr), conn.count_modes, sizeof(struct drm_mode_modeinfo));
+	r->count_encoders = conn.count_encoders;
+	r->encoders     = drmAllocCpy(U642VOID(conn.encoders_ptr), conn.count_encoders, sizeof(uint32_t));
+	r->connector_type  = conn.connector_type;
+	r->connector_type_id = conn.connector_type_id;
 
 err_allocs:
-	drmFree(U642VOID(out.prop_values_ptr));
-	drmFree(U642VOID(out.props_ptr));
-	drmFree(U642VOID(out.modes_ptr));
-	drmFree(U642VOID(out.encoders_ptr));
+	drmFree(U642VOID(conn.prop_values_ptr));
+	drmFree(U642VOID(conn.props_ptr));
+	drmFree(U642VOID(conn.modes_ptr));
+	drmFree(U642VOID(conn.encoders_ptr));
 
 	return r;
 }
 
-int drmModeAttachMode(int fd, uint32_t output_id, struct drm_mode_modeinfo *mode_info)
+int drmModeAttachMode(int fd, uint32_t connector_id, struct drm_mode_modeinfo *mode_info)
 {
 	struct drm_mode_mode_cmd res;
 
 	memcpy(&res.mode, mode_info, sizeof(struct drm_mode_modeinfo));
-	res.output_id = output_id;
+	res.connector_id = connector_id;
 
 	return ioctl(fd, DRM_IOCTL_MODE_ATTACHMODE, &res);
 }
 
-int drmModeDetachMode(int fd, uint32_t output_id, struct drm_mode_modeinfo *mode_info)
+int drmModeDetachMode(int fd, uint32_t connector_id, struct drm_mode_modeinfo *mode_info)
 {
 	struct drm_mode_mode_cmd res;
 
 	memcpy(&res.mode, mode_info, sizeof(struct drm_mode_modeinfo));
-	res.output_id = output_id;
+	res.connector_id = connector_id;
 
 	return ioctl(fd, DRM_IOCTL_MODE_DETACHMODE, &res);
 }
@@ -574,13 +574,13 @@ void drmModeFreePropertyBlob(drmModePropertyBlobPtr ptr)
 	drmFree(ptr);
 }
 
-int drmModeOutputSetProperty(int fd, uint32_t output_id, uint32_t property_id,
+int drmModeConnectorSetProperty(int fd, uint32_t connector_id, uint32_t property_id,
 			     uint64_t value)
 {
-	struct drm_mode_output_set_property osp;
+	struct drm_mode_connector_set_property osp;
 	int ret;
 
-	osp.output_id = output_id;
+	osp.connector_id = connector_id;
 	osp.prop_id = property_id;
 	osp.value = value;
 
-- 
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.c | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'libdrm/xf86drmMode.c')

diff --git a/libdrm/xf86drmMode.c b/libdrm/xf86drmMode.c
index a18c4290..8b7f2bcf 100644
--- a/libdrm/xf86drmMode.c
+++ b/libdrm/xf86drmMode.c
@@ -381,10 +381,6 @@ drmModeConnectorPtr drmModeGetConnector(int fd, uint32_t connector_id)
 	conn.connector = connector_id;
 	conn.connector_type_id = 0;
 	conn.connector_type  = 0;
-	conn.count_crtcs  = 0;
-	conn.crtcs        = 0;
-	conn.count_clones = 0;
-	conn.clones       = 0;
 	conn.count_modes  = 0;
 	conn.modes_ptr    = 0;
 	conn.count_props  = 0;
@@ -420,12 +416,8 @@ drmModeConnectorPtr drmModeGetConnector(int fd, uint32_t connector_id)
 	r->mmWidth      = conn.mm_width;
 	r->mmHeight     = conn.mm_height;
 	r->subpixel     = conn.subpixel;
-	r->count_crtcs  = conn.count_crtcs;
-	r->count_clones = conn.count_clones;
 	r->count_modes  = conn.count_modes;
 	/* TODO we should test if these alloc & cpy fails. */
-	r->crtcs        = conn.crtcs;
-	r->clones       = conn.clones;
 	r->count_props  = conn.count_props;
 	r->props        = drmAllocCpy(U642VOID(conn.props_ptr), conn.count_props, sizeof(uint32_t));
 	r->prop_values  = drmAllocCpy(U642VOID(conn.prop_values_ptr), conn.count_props, sizeof(uint64_t));
-- 
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.c | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

(limited to 'libdrm/xf86drmMode.c')

diff --git a/libdrm/xf86drmMode.c b/libdrm/xf86drmMode.c
index 8b7f2bcf..d11fc12e 100644
--- a/libdrm/xf86drmMode.c
+++ b/libdrm/xf86drmMode.c
@@ -254,10 +254,6 @@ drmModeCrtcPtr drmModeGetCrtc(int fd, uint32_t crtcId)
 	struct drm_mode_crtc crtc;
 	drmModeCrtcPtr r;
 
-	crtc.count_connectors   = 0;
-	crtc.connectors         = 0;
-	crtc.count_possibles = 0;
-	crtc.possibles       = 0;
 	crtc.crtc_id = crtcId;
 
 	if (ioctl(fd, DRM_IOCTL_MODE_GETCRTC, &crtc))
@@ -278,12 +274,6 @@ drmModeCrtcPtr drmModeGetCrtc(int fd, uint32_t crtcId)
 		memcpy(&r->mode, &crtc.mode, sizeof(struct drm_mode_modeinfo));
 	r->buffer_id       = crtc.fb_id;
 	r->gamma_size      = crtc.gamma_size;
-	r->count_connectors   = crtc.count_connectors;
-	r->count_possibles = crtc.count_possibles;
-	/* TODO we realy should test if these alloc & cpy fails. */
-	r->connectors         = crtc.connectors;
-	r->possibles       = crtc.possibles;
-
 	return r;
 }
 
@@ -362,6 +352,8 @@ drmModeEncoderPtr drmModeGetEncoder(int fd, uint32_t encoder_id)
 	if (!(r = drmMalloc(sizeof(*r))))
 		return 0;
 
+	r->encoder_id = enc.encoder_id;
+	r->crtc = enc.crtc;
 	r->encoder_type = enc.encoder_type;
 	r->crtcs = enc.crtcs;
 	r->clones = enc.clones;
@@ -411,7 +403,7 @@ drmModeConnectorPtr drmModeGetConnector(int fd, uint32_t connector_id)
 	}
 
 	r->connector_id = conn.connector;
-	r->crtc = conn.crtc;
+	r->encoder = conn.encoder;
 	r->connection   = conn.connection;
 	r->mmWidth      = conn.mm_width;
 	r->mmHeight     = conn.mm_height;
-- 
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.c | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

(limited to 'libdrm/xf86drmMode.c')

diff --git a/libdrm/xf86drmMode.c b/libdrm/xf86drmMode.c
index d11fc12e..a393f965 100644
--- a/libdrm/xf86drmMode.c
+++ b/libdrm/xf86drmMode.c
@@ -657,3 +657,39 @@ int drmModeReplaceFB(int fd, uint32_t buffer_id,
 
 	return 0;
 }
+
+int drmModeCrtcGetGamma(int fd, uint32_t crtc_id, uint32_t size,
+			uint16_t *red, uint16_t *green, uint16_t *blue)
+{
+	int ret;
+	struct drm_mode_crtc_lut l;
+
+	l.crtc_id = crtc_id;
+	l.gamma_size = size;
+	l.red = VOID2U64(red);
+	l.green = VOID2U64(green);
+	l.blue = VOID2U64(blue);
+	
+	if ((ret = ioctl(fd, DRM_IOCTL_MODE_GETGAMMA, &l)))
+		return ret;
+
+	return 0;
+}
+
+int drmModeCrtcSetGamma(int fd, uint32_t crtc_id, uint32_t size,
+			uint16_t *red, uint16_t *green, uint16_t *blue)
+{
+	int ret;
+	struct drm_mode_crtc_lut l;
+
+	l.crtc_id = crtc_id;
+	l.gamma_size = size;
+	l.red = VOID2U64(red);
+	l.green = VOID2U64(green);
+	l.blue = VOID2U64(blue);
+	
+	if ((ret = ioctl(fd, DRM_IOCTL_MODE_SETGAMMA, &l)))
+		return ret;
+
+	return 0;
+}
-- 
cgit v1.2.3


From f9dad8cc22994e0e4671d14b3ee721e4b5777a68 Mon Sep 17 00:00:00 2001
From: Maarten Maathuis <madman2003@gmail.com>
Date: Mon, 23 Jun 2008 21:15:54 +0200
Subject: libdrm: check for allocation failure

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

(limited to 'libdrm/xf86drmMode.c')

diff --git a/libdrm/xf86drmMode.c b/libdrm/xf86drmMode.c
index a393f965..df865415 100644
--- a/libdrm/xf86drmMode.c
+++ b/libdrm/xf86drmMode.c
@@ -419,6 +419,9 @@ drmModeConnectorPtr drmModeGetConnector(int fd, uint32_t connector_id)
 	r->connector_type  = conn.connector_type;
 	r->connector_type_id = conn.connector_type_id;
 
+	if (!r->props || !r->prop_values || !r->modes || !r->encoders)
+		goto err_allocs;
+
 err_allocs:
 	drmFree(U642VOID(conn.prop_values_ptr));
 	drmFree(U642VOID(conn.props_ptr));
-- 
cgit v1.2.3


From 9f28da80f6cc8e45670b217a2483983f2838095d Mon Sep 17 00:00:00 2001
From: Maarten Maathuis <madman2003@gmail.com>
Date: Fri, 27 Jun 2008 18:45:08 +0200
Subject: Change some obviously wrong things about property blobs, still broken
 though.

- I do not fully understand these blobs, so i'm leaving it at this for the moment.
---
 libdrm/xf86drmMode.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'libdrm/xf86drmMode.c')

diff --git a/libdrm/xf86drmMode.c b/libdrm/xf86drmMode.c
index df865415..ca21a961 100644
--- a/libdrm/xf86drmMode.c
+++ b/libdrm/xf86drmMode.c
@@ -495,7 +495,7 @@ drmModePropertyPtr drmModeGetProperty(int fd, uint32_t property_id)
 	if (prop.flags & DRM_MODE_PROP_ENUM) {
 		r->count_enums = prop.count_enum_blobs;
 		r->enums = drmAllocCpy(U642VOID(prop.enum_blob_ptr), prop.count_enum_blobs, sizeof(struct drm_mode_property_enum));
-	} else	if (prop.flags & DRM_MODE_PROP_ENUM) {
+	} else if (prop.flags & DRM_MODE_PROP_BLOB) {
 		r->values = drmAllocCpy(U642VOID(prop.values_ptr), prop.count_enum_blobs, sizeof(uint32_t));
 		r->blob_ids = drmAllocCpy(U642VOID(prop.enum_blob_ptr), prop.count_enum_blobs, sizeof(uint32_t));
 		r->count_blobs = prop.count_enum_blobs;
-- 
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.c | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

(limited to 'libdrm/xf86drmMode.c')

diff --git a/libdrm/xf86drmMode.c b/libdrm/xf86drmMode.c
index ca21a961..c3921ee9 100644
--- a/libdrm/xf86drmMode.c
+++ b/libdrm/xf86drmMode.c
@@ -284,11 +284,6 @@ int drmModeSetCrtc(int fd, uint32_t crtcId, uint32_t bufferId,
 {
 	struct drm_mode_crtc crtc;
 
-	crtc.count_connectors   = 0;
-	crtc.connectors         = 0;
-	crtc.count_possibles = 0;
-	crtc.possibles       = 0;
-
 	crtc.x             = x;
 	crtc.y             = y;
 	crtc.crtc_id       = crtcId;
@@ -343,8 +338,8 @@ drmModeEncoderPtr drmModeGetEncoder(int fd, uint32_t encoder_id)
 
 	enc.encoder_id = encoder_id;
 	enc.encoder_type = 0;
-	enc.crtcs = 0;
-	enc.clones = 0;
+	enc.possible_crtcs = 0;
+	enc.possible_clones = 0;
 
 	if (ioctl(fd, DRM_IOCTL_MODE_GETENCODER, &enc))
 		return 0;
@@ -353,10 +348,10 @@ drmModeEncoderPtr drmModeGetEncoder(int fd, uint32_t encoder_id)
 		return 0;
 
 	r->encoder_id = enc.encoder_id;
-	r->crtc = enc.crtc;
+	r->crtc_id = enc.crtc_id;
 	r->encoder_type = enc.encoder_type;
-	r->crtcs = enc.crtcs;
-	r->clones = enc.clones;
+	r->possible_crtcs = enc.possible_crtcs;
+	r->possible_clones = enc.possible_clones;
 
 	return r;
 }
@@ -370,7 +365,7 @@ drmModeConnectorPtr drmModeGetConnector(int fd, uint32_t connector_id)
 	struct drm_mode_get_connector conn;
 	drmModeConnectorPtr r = NULL;
 
-	conn.connector = connector_id;
+	conn.connector_id = connector_id;
 	conn.connector_type_id = 0;
 	conn.connector_type  = 0;
 	conn.count_modes  = 0;
@@ -402,8 +397,8 @@ drmModeConnectorPtr drmModeGetConnector(int fd, uint32_t connector_id)
 		goto err_allocs;
 	}
 
-	r->connector_id = conn.connector;
-	r->encoder = conn.encoder;
+	r->connector_id = conn.connector_id;
+	r->encoder_id = conn.encoder_id;
 	r->connection   = conn.connection;
 	r->mmWidth      = conn.mm_width;
 	r->mmHeight     = conn.mm_height;
-- 
cgit v1.2.3


From 34a3ebffc369575412a4ff2c05c50264e83c6d3e Mon Sep 17 00:00:00 2001
From: Jakob Bornecrantz <jakob@tungstengraphics.com>
Date: Fri, 24 Oct 2008 18:43:55 +0200
Subject: mode: Try to settle on a standard for struct fields

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

(limited to 'libdrm/xf86drmMode.c')

diff --git a/libdrm/xf86drmMode.c b/libdrm/xf86drmMode.c
index c3921ee9..a25b11bb 100644
--- a/libdrm/xf86drmMode.c
+++ b/libdrm/xf86drmMode.c
@@ -308,7 +308,7 @@ int drmModeSetCursor(int fd, uint32_t crtcId, uint32_t bo_handle, uint32_t width
 	struct drm_mode_cursor arg;
 
 	arg.flags = DRM_MODE_CURSOR_BO;
-	arg.crtc = crtcId;
+	arg.crtc_id = crtcId;
 	arg.width = width;
 	arg.height = height;
 	arg.handle = bo_handle;
@@ -321,7 +321,7 @@ int drmModeMoveCursor(int fd, uint32_t crtcId, int x, int y)
 	struct drm_mode_cursor arg;
 
 	arg.flags = DRM_MODE_CURSOR_MOVE;
-	arg.crtc = crtcId;
+	arg.crtc_id = crtcId;
 	arg.x = x;
 	arg.y = y;
 
-- 
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.c | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'libdrm/xf86drmMode.c')

diff --git a/libdrm/xf86drmMode.c b/libdrm/xf86drmMode.c
index a25b11bb..38fdbc11 100644
--- a/libdrm/xf86drmMode.c
+++ b/libdrm/xf86drmMode.c
@@ -183,15 +183,6 @@ err_allocs:
 	return r;
 }
 
-uint32_t drmModeGetHotplug(int fd)
-{
-	struct drm_mode_hotplug arg;
-	arg.counter = 0;
-
-	ioctl(fd, DRM_IOCTL_MODE_HOTPLUG, &arg);
-	return arg.counter;
-}
-
 int drmModeAddFB(int fd, uint32_t width, uint32_t height, uint8_t depth,
                  uint8_t bpp, uint32_t pitch, uint32_t bo_handle,
 		 uint32_t *buf_id)
-- 
cgit v1.2.3


From 9a4cb7eab4f74747cc777a3fef31dbb46e1191e5 Mon Sep 17 00:00:00 2001
From: Jakob Bornecrantz <jakob@tungstengraphics.com>
Date: Wed, 12 Nov 2008 19:17:18 +0100
Subject: mode: Minor reodering and renaming

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

(limited to 'libdrm/xf86drmMode.c')

diff --git a/libdrm/xf86drmMode.c b/libdrm/xf86drmMode.c
index 38fdbc11..a0a164de 100644
--- a/libdrm/xf86drmMode.c
+++ b/libdrm/xf86drmMode.c
@@ -200,7 +200,7 @@ int drmModeAddFB(int fd, uint32_t width, uint32_t height, uint8_t depth,
 	if ((ret = ioctl(fd, DRM_IOCTL_MODE_ADDFB, &f)))
 		return ret;
 
-	*buf_id = f.buffer_id;
+	*buf_id = f.fb_id;
 	return 0;
 }
 
@@ -216,7 +216,7 @@ drmModeFBPtr drmModeGetFB(int fd, uint32_t buf)
 	struct drm_mode_fb_cmd info;
 	drmModeFBPtr r;
 
-	info.buffer_id = buf;
+	info.fb_id = buf;
 
 	if (ioctl(fd, DRM_IOCTL_MODE_GETFB, &info))
 		return NULL;
@@ -224,7 +224,7 @@ drmModeFBPtr drmModeGetFB(int fd, uint32_t buf)
 	if (!(r = drmMalloc(sizeof(*r))))
 		return NULL;
 
-	r->buffer_id = info.buffer_id;
+	r->fb_id = info.fb_id;
 	r->width = info.width;
 	r->height = info.height;
 	r->pitch = info.pitch;
@@ -639,7 +639,7 @@ int drmModeReplaceFB(int fd, uint32_t buffer_id,
 	f.bpp = bpp;
 	f.depth = depth;
 	f.handle = bo_handle;
-	f.buffer_id = buffer_id;
+	f.fb_id = buffer_id;
 
 	if ((ret = ioctl(fd, DRM_IOCTL_MODE_REPLACEFB, &f)))
 		return ret;
-- 
cgit v1.2.3