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

(limited to 'libdrm')

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