From 5bffbd6e275efffbb649c20c528a11412ccf99cd Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@linux.ie>
Date: Thu, 5 Apr 2007 13:34:50 +1000
Subject: initial userspace interface to get modes

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

(limited to 'libdrm')

diff --git a/libdrm/Makefile.am b/libdrm/Makefile.am
index e7e07e47..24c32038 100644
--- a/libdrm/Makefile.am
+++ b/libdrm/Makefile.am
@@ -23,9 +23,9 @@ libdrm_ladir = $(libdir)
 libdrm_la_LDFLAGS = -version-number 2:3:0 -no-undefined
 
 AM_CFLAGS = -I$(top_srcdir)/shared-core
-libdrm_la_SOURCES = xf86drm.c xf86drmHash.c xf86drmRandom.c xf86drmSL.c
+libdrm_la_SOURCES = xf86drm.c xf86drmHash.c xf86drmRandom.c xf86drmSL.c xf86drmMode.c
 
 libdrmincludedir = ${includedir}
-libdrminclude_HEADERS = xf86drm.h xf86mm.h
+libdrminclude_HEADERS = xf86drm.h xf86mm.h xf86drmMode.h
 
 EXTRA_DIST = ChangeLog TODO
-- 
cgit v1.2.3


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 +++++++++++++++++++++++++++++++++++++++++++++++++++
 libdrm/xf86drmMode.h | 290 ++++++++++++++++++++++++++++++++++++
 2 files changed, 697 insertions(+)
 create mode 100644 libdrm/xf86drmMode.c
 create mode 100644 libdrm/xf86drmMode.h

(limited to 'libdrm')

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


From 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')

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 ++++++++++++++++++++++
 libdrm/xf86drmMode.h |  6 ++++--
 2 files changed, 26 insertions(+), 2 deletions(-)

(limited to 'libdrm')

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


From 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')

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 +++-----
 libdrm/xf86drmMode.h | 8 +++-----
 2 files changed, 6 insertions(+), 10 deletions(-)

(limited to 'libdrm')

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


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

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

(limited to 'libdrm')

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


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

---
 libdrm/xf86drmMode.c | 25 +++++++++++--------------
 libdrm/xf86drmMode.h | 15 ++++++++-------
 2 files changed, 19 insertions(+), 21 deletions(-)

(limited to 'libdrm')

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


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

---
 libdrm/xf86drmMode.c | 3 ++-
 libdrm/xf86drmMode.h | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'libdrm')

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


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

---
 libdrm/xf86drmMode.c | 52 +++++++++++++++++-----------------------------------
 libdrm/xf86drmMode.h | 15 ++++-----------
 2 files changed, 21 insertions(+), 46 deletions(-)

(limited to 'libdrm')

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
diff --git a/libdrm/xf86drmMode.h b/libdrm/xf86drmMode.h
index cdc82f7d..6a566c4d 100644
--- a/libdrm/xf86drmMode.h
+++ b/libdrm/xf86drmMode.h
@@ -76,14 +76,7 @@ typedef struct _drmModeRes {
 
 } drmModeRes, *drmModeResPtr;
 
-typedef struct _drmModeFrameBuffer {
-
-	uint32_t width;
-	uint32_t height;
-	uint32_t pitch;
-	uint8_t bpp;
-
-} drmModeFrameBuffer, *drmModeFrameBufferPtr;
+typedef struct drm_mode_fb_cmd drmModeFrameBuffer, *drmModeFrameBufferPtr;
 
 typedef struct _drmModeCrtc {
 
@@ -209,14 +202,14 @@ extern int drmModeForceProbe(int fd, uint32_t outputId);
 /**
  * Retrive information about framebuffer bufferId
  */
-extern drmModeFrameBufferPtr drmModeGetFB(int fd,
-		uint32_t bufferId);
+extern drmModeFrameBufferPtr drmModeGetFB(int fd, uint32_t bufferId);
 
 /**
  * Creates a new framebuffer with an buffer object as its scanout buffer.
  */
 extern int drmModeAddFB(int fd, uint32_t width, uint32_t height, uint8_t depth,
-			uint8_t bpp, uint32_t pitch, drmBO *bo, uint32_t *buf_id);
+			uint8_t bpp, uint32_t pitch, drmBO *bo,
+			uint32_t *buf_id);
 /**
  * Destroies the given framebuffer.
  */
-- 
cgit v1.2.3


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

---
 libdrm/xf86drmMode.c | 2 +-
 libdrm/xf86drmMode.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'libdrm')

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;
diff --git a/libdrm/xf86drmMode.h b/libdrm/xf86drmMode.h
index 6a566c4d..c87a95da 100644
--- a/libdrm/xf86drmMode.h
+++ b/libdrm/xf86drmMode.h
@@ -80,7 +80,7 @@ typedef struct drm_mode_fb_cmd drmModeFrameBuffer, *drmModeFrameBufferPtr;
 
 typedef struct _drmModeCrtc {
 
-	unsigned int bufferId; /**< Buffer currently connected to */
+	unsigned int buffer_id; /**< FB id to connect to 0 = disconnect*/
 
 	uint32_t x, y; /**< Position on the frameuffer */
 	uint32_t width, height;
-- 
cgit v1.2.3


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

---
 libdrm/xf86drmMode.c | 6 +++---
 libdrm/xf86drmMode.h | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'libdrm')

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;
 
diff --git a/libdrm/xf86drmMode.h b/libdrm/xf86drmMode.h
index c87a95da..6aa104a9 100644
--- a/libdrm/xf86drmMode.h
+++ b/libdrm/xf86drmMode.h
@@ -76,7 +76,7 @@ typedef struct _drmModeRes {
 
 } drmModeRes, *drmModeResPtr;
 
-typedef struct drm_mode_fb_cmd drmModeFrameBuffer, *drmModeFrameBufferPtr;
+typedef struct drm_mode_fb_cmd drmModeFB, *drmModeFBPtr;
 
 typedef struct _drmModeCrtc {
 
@@ -180,7 +180,7 @@ typedef struct _drmModeOutput {
 
 extern void drmModeFreeModeInfo( struct drm_mode_modeinfo *ptr );
 extern void drmModeFreeResources( drmModeResPtr ptr );
-extern void drmModeFreeFrameBuffer( drmModeFrameBufferPtr ptr );
+extern void drmModeFreeFB( drmModeFBPtr ptr );
 extern void drmModeFreeCrtc( drmModeCrtcPtr ptr );
 extern void drmModeFreeOutput( drmModeOutputPtr ptr );
 
@@ -202,7 +202,7 @@ extern int drmModeForceProbe(int fd, uint32_t outputId);
 /**
  * Retrive information about framebuffer bufferId
  */
-extern drmModeFrameBufferPtr drmModeGetFB(int fd, uint32_t bufferId);
+extern drmModeFBPtr drmModeGetFB(int fd, uint32_t bufferId);
 
 /**
  * Creates a new framebuffer with an buffer object as its scanout buffer.
-- 
cgit v1.2.3