Merge branch 'modesetting-gem' of ssh://git.freedesktop.org/git/mesa/drm into modeset...

[profile/ivi/libdrm.git] / libdrm / xf86drmMode.h

diff --git a/libdrm/xf86drmMode.h b/libdrm/xf86drmMode.h
index 601a646..59612a9 100644 (file)
--- a/libdrm/xf86drmMode.h
+++ b/libdrm/xf86drmMode.h
@@ -32,7 +32,6 @@
  */
 
 #include <drm.h>
-#include "xf86mm.h"
 
 /*
  * This is the interface for modesetting for drm.
@@ -51,7 +50,6 @@
  * buffer object interface. This object needs to be pinned.
  */
 
-
 typedef struct _drmModeRes {
 
        int count_fbs;
@@ -60,8 +58,8 @@ typedef struct _drmModeRes {
        int count_crtcs;
        uint32_t *crtcs;
 
-       int count_outputs;
-       uint32_t *outputs;
+       int count_connectors;
+       uint32_t *connectors;
 
        int count_encoders;
        uint32_t *encoders;
@@ -92,19 +90,13 @@ typedef struct _drmModeProperty {
 
 typedef struct _drmModeCrtc {
        unsigned int crtc_id;
-       unsigned int buffer_id; /**< FB id to connect to 0 = disconnect*/
+       unsigned int buffer_id; /**< FB id to connect to 0 = disconnect */
 
-       uint32_t x, y; /**< Position on the frameuffer */
+       uint32_t x, y; /**< Position on the framebuffer */
        uint32_t width, height;
        int mode_valid;
        struct drm_mode_modeinfo mode;
 
-       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;
@@ -112,8 +104,9 @@ typedef struct _drmModeCrtc {
 typedef struct _drmModeEncoder {
        unsigned int encoder_id;
        unsigned int encoder_type;
-       uint32_t crtcs;
-       uint32_t clones;
+       unsigned int crtc_id;
+       uint32_t possible_crtcs;
+       uint32_t possible_clones;
 } drmModeEncoder, *drmModeEncoderPtr;
 
 typedef enum {
@@ -131,22 +124,15 @@ typedef enum {
        DRM_MODE_SUBPIXEL_NONE           = 6
 } drmModeSubPixel;
 
-typedef struct _drmModeOutput {
-       unsigned int output_id;
-
-       unsigned int crtc; /**< Crtc currently connected to */
-       unsigned int output_type;
-       unsigned int output_type_id;
+typedef struct _drmModeConnector {
+       unsigned int connector_id;
+       unsigned int encoder_id; /**< Encoder currently connected to */
+       unsigned int connector_type;
+       unsigned int connector_type_id;
        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;
        struct drm_mode_modeinfo *modes;
 
@@ -156,7 +142,7 @@ typedef struct _drmModeOutput {
 
        int count_encoders;
        uint32_t *encoders; /**< List of encoder ids */
-} drmModeOutput, *drmModeOutputPtr;
+} drmModeConnector, *drmModeConnectorPtr;
 
 
 
@@ -164,7 +150,8 @@ extern void drmModeFreeModeInfo( struct drm_mode_modeinfo *ptr );
 extern void drmModeFreeResources( drmModeResPtr ptr );
 extern void drmModeFreeFB( drmModeFBPtr ptr );
 extern void drmModeFreeCrtc( drmModeCrtcPtr ptr );
-extern void drmModeFreeOutput( drmModeOutputPtr ptr );
+extern void drmModeFreeConnector( drmModeConnectorPtr ptr );
+extern void drmModeFreeEncoder( drmModeEncoderPtr ptr );
 
 /**
  * Retrives all of the resources associated with a card.
@@ -216,7 +203,7 @@ extern drmModeCrtcPtr drmModeGetCrtc(int fd, uint32_t crtcId);
  * Set the mode on a crtc crtcId with the given mode modeId.
  */
 int drmModeSetCrtc(int fd, uint32_t crtcId, uint32_t bufferId,
-                   uint32_t x, uint32_t y, uint32_t *outputs, int count,
+                   uint32_t x, uint32_t y, uint32_t *connectors, int count,
                   struct drm_mode_modeinfo *mode);
 
 /*
@@ -239,31 +226,36 @@ int drmModeMoveCursor(int fd, uint32_t crtcId, int x, int y);
 drmModeEncoderPtr drmModeGetEncoder(int fd, uint32_t encoder_id);
 
 /*
- * Output manipulation
+ * Connector manipulation
  */
 
 /**
- * Retrive information about the output outputId.
+ * Retrive information about the connector connectorId.
  */
-extern drmModeOutputPtr drmModeGetOutput(int fd,
-               uint32_t outputId);
+extern drmModeConnectorPtr drmModeGetConnector(int fd,
+               uint32_t connectorId);
 
 /**
- * Attaches the given mode to an output.
+ * Attaches the given mode to an connector.
  */
-extern int drmModeAttachMode(int fd, uint32_t outputId, struct drm_mode_modeinfo *mode_info);
+extern int drmModeAttachMode(int fd, uint32_t connectorId, struct drm_mode_modeinfo *mode_info);
 
 /**
- * Detaches a mode from the output
+ * Detaches a mode from the connector
  * must be unused, by the given mode.
  */
-extern int drmModeDetachMode(int fd, uint32_t outputId, struct drm_mode_modeinfo *mode_info);
+extern int drmModeDetachMode(int fd, uint32_t connectorId, struct drm_mode_modeinfo *mode_info);
 
 extern drmModePropertyPtr drmModeGetProperty(int fd, uint32_t propertyId);
 extern void drmModeFreeProperty(drmModePropertyPtr ptr);
 
 extern drmModePropertyBlobPtr drmModeGetPropertyBlob(int fd, uint32_t blob_id);
 extern void drmModeFreePropertyBlob(drmModePropertyBlobPtr ptr);
-extern int drmModeOutputSetProperty(int fd, uint32_t output_id, uint32_t property_id,
+extern int drmModeConnectorSetProperty(int fd, uint32_t connector_id, uint32_t property_id,
                                    uint64_t value);
 extern int drmCheckModesettingSupported(const char *busid);
+
+extern int drmModeCrtcSetGamma(int fd, uint32_t crtc_id, uint32_t size,
+                              uint16_t *red, uint16_t *green, uint16_t *blue);
+extern int drmModeCrtcGetGamma(int fd, uint32_t crtc_id, uint32_t size,
+                              uint16_t *red, uint16_t *green, uint16_t *blue);