summaryrefslogtreecommitdiff
path: root/libdrm
diff options
context:
space:
mode:
authorJesse Barnes <jbarnes@hobbes.virtuousgeek.org>2007-05-17 10:35:07 -0700
committerJesse Barnes <jbarnes@hobbes.virtuousgeek.org>2007-05-17 10:35:07 -0700
commitb7bf317f42915dc4f5fde4a696e37985cea45104 (patch)
tree7101a08e7a10e0a74ac3971b99aeaee6ed1f888f /libdrm
parenta18b4befb9b76c4b2662ff6caa0e4f0975eb8e9c (diff)
parentfd63ea971322246734fca5977a800c3ef51cc3fe (diff)
Merge branch 'modesetting-101' of git+ssh://git.freedesktop.org/git/mesa/drm into origin/modesetting-101
Conflicts: linux-core/drm_crtc.c linux-core/drm_fb.c Lots of changes to merge with alanh's latest stuff: o fix use of fb->pitch now that it has the right value o add new helper for finding the CRTC given an FB o fix new fb_probe/fb_remove functions to take a CRTC o fixup callers of new FB routines o port drm_fb changes to intel_fb o check for errors after creating fb buffer object o go back to using cfb_imageblit since the accel stubs aren't ready
Diffstat (limited to 'libdrm')
-rw-r--r--libdrm/xf86drmMode.c63
-rw-r--r--libdrm/xf86drmMode.h104
2 files changed, 37 insertions, 130 deletions
diff --git a/libdrm/xf86drmMode.c b/libdrm/xf86drmMode.c
index b695467b..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;
@@ -376,37 +358,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
diff --git a/libdrm/xf86drmMode.h b/libdrm/xf86drmMode.h
index 6aa104a9..b25a6610 100644
--- a/libdrm/xf86drmMode.h
+++ b/libdrm/xf86drmMode.h
@@ -40,25 +40,17 @@
* In order to use this interface you must include either <stdint.h> or another
* header defining uint32_t, int32_t and uint16_t.
*
- * It aims to provide a randr compatible interface for modesettings in the
+ * It aims to provide a randr1.2 compatible interface for modesettings in the
* kernel, the interface is also ment to be used by libraries like EGL.
*
* More information can be found in randrproto.txt which can be found here:
* http://gitweb.freedesktop.org/?p=xorg/proto/randrproto.git
*
- * All framebuffer, crtc and output ids start at 1 while 0 is either an invalid
- * parameter or used to indicate that the command should disconnect from the
- * currently bound target, as with drmModeMapOutput.
- *
- * Currently only one framebuffer exist and has a id of 1, which is also the
- * default framebuffer and should allways be avaible to the client, unless
- * it is locked/used or any other limiting state is applied on it.
- *
+ * There are some major diffrences to be noted. Unlike the randr1.2 proto you
+ * need to create the memory object of the framebuffer yourself with the ttm
+ * buffer object interface. This object needs to be pinned.
*/
-typedef struct _drmModeGammaTriple {
- uint16_t r, g, b;
-} drmModeGammaTriple, *drmModeGammaTriplePtr;
typedef struct _drmModeRes {
@@ -130,53 +122,7 @@ typedef struct _drmModeOutput {
} drmModeOutput, *drmModeOutputPtr;
-/*
- * RRSetScreenConfig o
- * RRGetScreenInfo o
- *
- * RRGetScreenSizeRange - see frameBuffer info
- * RRSetScreenSize
- * RRGetScreenResources
- *
- * RRGetOutputInfo
- *
- * RRListOutputProperties *
- * RRQueryOutputProperty *
- * RRConfigureOutputProperty *
- * RRChangeOutputProperty *
- * RRDeleteOutputProperty *
- * RRGetOutputProperty *
- *
- * RRCreateMode
- * RRDestroyMode
- * RRAddOutputMode
- * RRDeleteOutputMode
- *
- * RRGetCrtcInfo
- * RRSetCrtcConfig
- *
- * RRGetCrtcGammaSize - see crtc info
- * RRGetCrtcGamma
- * RRSetCrtcGamma
- *
- * drmModeGetResources
- * drmModeForceProbe
- *
- * drmModeGetFrameBufferInfo
- * drmModeSetFrameBufferSize
- *
- * drmModeGetCrtcInfo
- * drmModeSetCrtcConfig
- * drmModeGetCrtcGamma
- * drmModeSetCrtcGamma
- *
- * drmModeGetOutputInfo
- *
- * drmModeAddMode
- * drmModeDestroyMode
- * drmModeAddOutputMode
- * drmModeDeleteOutputMode
- */
+
extern void drmModeFreeModeInfo( struct drm_mode_modeinfo *ptr );
extern void drmModeFreeResources( drmModeResPtr ptr );
@@ -189,11 +135,6 @@ extern void drmModeFreeOutput( drmModeOutputPtr ptr );
*/
extern drmModeResPtr drmModeGetResources(int fd);
-/**
- * Forces a probe of the give output outputId, on 0 all will be probed.
- */
-extern int drmModeForceProbe(int fd, uint32_t outputId);
-
/*
* FrameBuffer manipulation.
@@ -215,13 +156,9 @@ extern int drmModeAddFB(int fd, uint32_t width, uint32_t height, uint8_t depth,
*/
extern int drmModeRmFB(int fd, uint32_t bufferId);
-/**
- * Changes the scanout buffer to the given buffer object.
- */
-extern int drmModeFlipFrameBuffer(int fd, uint32_t bufferId, drmBO *bo);
/*
- * Crtc function.
+ * Crtc functions
*/
/**
@@ -236,19 +173,6 @@ extern int drmModeSetCrtc(int fd, uint32_t crtcId, uint32_t bufferId,
uint32_t x, uint32_t y, uint32_t modeId,
uint32_t *outputs, int count);
-/**
- * Gets the gamma from a crtc
- */
-extern drmModeGammaTriplePtr drmModeGetCrtcGamma(int fd, uint32_t crtcId,
- int *count);
-
-/**
- * Sets the gamma on a crtc
- */
-extern int drmModeSetCrtcGamma(int fd, uint32_t crtcId,
- drmModeGammaTriplePtr ptr, int count);
-
-
/*
* Output manipulation
@@ -261,24 +185,24 @@ extern drmModeOutputPtr drmModeGetOutput(int fd,
uint32_t outputId);
/**
- * Creates a new mode from the given mode info.
+ * Adds a new mode from the given mode info.
* Name must be unique.
*/
-extern uint32_t drmModeNewMode(int fd, struct drm_mode_modeinfo *modeInfo);
+extern uint32_t drmModeAddMode(int fd, struct drm_mode_modeinfo *modeInfo);
/**
- * Destroys a mode created with CreateMode, must be unused.
+ * Removes a mode created with AddMode, must be unused.
*/
-extern int drmModeDesMode(int fd, uint32_t modeId);
+extern int drmModeRmMode(int fd, uint32_t modeId);
/**
- * Adds the given mode to an output.
+ * Attaches the given mode to an output.
*/
-extern int drmModeAddMode(int fd, uint32_t outputId, uint32_t modeId);
+extern int drmModeAttachMode(int fd, uint32_t outputId, uint32_t modeId);
/**
- * Deletes a mode Added with AddOutputMode from the output,
+ * Detaches a mode from the output
* must be unused, by the given mode.
*/
-extern int drmModeDelMode(int fd, uint32_t outputId, uint32_t modeId);
+extern int drmModeDetachMode(int fd, uint32_t outputId, uint32_t modeId);