summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2012-01-23 16:06:21 +0000
committerDave Airlie <airlied@redhat.com>2012-01-23 16:06:21 +0000
commitd5f6ca94d147962453a6bfe676796575a93a57c3 (patch)
tree2a5b2c4b9b3ae2ee6b1a278343c71d10aa8621f5
parent0664868c88a18559e429e1cbb5fd351380ace7d8 (diff)
add randrproto set role supportdrvmodel
-rw-r--r--randr.h7
-rw-r--r--randrproto.h13
2 files changed, 16 insertions, 4 deletions
diff --git a/randr.h b/randr.h
index 6853d66..41d05b8 100644
--- a/randr.h
+++ b/randr.h
@@ -44,7 +44,7 @@ typedef unsigned long XRandrModeFlags;
#define RRNumberErrors 3
#define RRNumberEvents 2
-#define RRNumberRequests 39
+#define RRNumberRequests 40
#define X_RRQueryVersion 0
/* we skip 1 to make old clients fail pretty immediately */
@@ -117,6 +117,7 @@ typedef unsigned long XRandrModeFlags;
/* v1.5 */
#define X_RRGetProviders 37
#define X_RRGetProviderInfo 38
+#define X_RRSetProviderRole 39
/* Event selection bits */
#define RRScreenChangeNotifyMask (1L << 0)
@@ -190,7 +191,7 @@ typedef unsigned long XRandrModeFlags;
#define RR_Role_Undefined 0
#define RR_Role_Master 1
-#define RR_Role_Slave_Output 2
-#define RR_Role_Slave_Offload 4
+#define RR_Role_Slave_Offload 2
+#define RR_Role_Slave_Output 4
#endif /* _RANDR_H_ */
diff --git a/randrproto.h b/randrproto.h
index c185512..65ebca5 100644
--- a/randrproto.h
+++ b/randrproto.h
@@ -806,14 +806,25 @@ typedef struct {
CARD32 length B32;
CARD32 current_role B32;
CARD32 allowed_roles B32;
+ CARD32 max_master B32;
CARD16 nCrtcs B16;
CARD16 nOutputs B16;
- CARD32 pad0 B32;
CARD32 pad1 B32;
CARD32 pad2 B32;
} xRRGetProviderInfoReply;
#define sz_xRRGetProvidersInfoReply 32
+typedef struct {
+ CARD8 reqType;
+ CARD8 randrReqType;
+ CARD16 length B16;
+ RRProvider provider B32;
+ Time configTimestamp B32;
+ CARD32 new_role B32;
+ CARD32 exclusive_master B32; /* xinerama or GPU switch */
+} xRRSetProviderRoleReq;
+#define sz_xRRSetProviderRoleReq 20
+
/*
* event
*/