proto/randrproto: Branch 'master' - 2 commits

[Matthias Hopf]

 randrproto.txt |  148 ++++++++++++++++++++++++++++-----------------------------
 1 file changed, 74 insertions(+), 74 deletions(-)

New commits:
commit 77c7ab02bf62f057c32f666168fd0ceb03a85a2d
Author: Matthias Hopf <mhopf at suse.de>
Date:   Tue Aug 18 12:00:10 2009 +0200

    Should read "EDID", not "EdidData" (2).
    
    Also include reference to former name.

diff --git a/randrproto.txt b/randrproto.txt
index d9bef40..a70b8bd 100644
--- a/randrproto.txt
+++ b/randrproto.txt
@@ -1475,7 +1475,7 @@ doesn't handle a mandatory property correctly.
 
 	Raw EDID data from the device attached to the according
 	output. Should include main EDID data and all extension
-	blocks.
+	blocks. Previously known as EdidData.
 
     "SignalFormat"		aka RR_PROPERTY_SIGNAL_FORMAT
 	Type:			int32 / Atom
@@ -1526,9 +1526,9 @@ doesn't handle a mandatory property correctly.
 
 Property			Immutable	Mandatory since
 ────────			─────────	───────────────
-EdidData			yes		n/a
+EDID				yes		n/a
 
-EdidData is provided by the RandR frontend, thus not driver specific.
+EDID is provided by the RandR frontend, thus not driver specific.
 
 
 9.3 Properties introduced with version 1.3 of the RandR extension
commit 5c95df133062570fe134be002dcb167ac059203d
Author: Matthias Hopf <mhopf at suse.de>
Date:   Tue Aug 18 11:56:38 2009 +0200

    Sort properties alphabetically.

diff --git a/randrproto.txt b/randrproto.txt
index 9489d83..d9bef40 100644
--- a/randrproto.txt
+++ b/randrproto.txt
@@ -1401,6 +1401,73 @@ doesn't handle a mandatory property correctly.
 
 9.1 Known properties
 
+    "CloneList"			aka RR_PROPERTY_CLONE_LIST
+	Type:			int32 [2*n] / Atom pairs
+	Flags:			Immutable
+	Range/List:		0-
+
+	Some combinations of outputs on some cards cannot be served
+	independently from each other, because they are wired up to the same
+	encoder outputs.
+	This property lists all output + signal format pairs that are
+	driven together with this output, and thus can only be programmed in
+	clone mode with the same CRTC.
+	This property MUST be symmetric, but may change with changing signal
+	format. I.e. if the property for DVI-1/VGA specifies VGA-1/VGA to be
+	cloned, VGA-1/VGA has to list DVI-1/VGA as well.
+	Outputs / format pairs listed in this property MUST be included in the
+	CompatibilityList.
+
+    "CompatibilityList"		aka RR_PROPERTY_COMPATIBILITY_LIST
+	Type:			int32 [2*n] / Atom pairs
+	Flags:			Immutable
+	Range/List:		0-
+
+	Some combinations of outputs on some cards cannot be served at all,
+	because the according encoder is only capable of driving one output at
+	a time.
+	This property lists all output + signal format pairs that can be
+	driven together with this output. NULL atoms specify any output / any
+	signal format, respectively.
+	This property MUST be symmetric, but may change with changing signal
+	format. I.e. if the property for DVI-1/TMDS specifies VGA-1/VGA to be
+	available, VGA-1/VGA has to list DVI-1/TMDS as well.
+
+    "ConnectorNumber"		aka RR_PROPERTY_CONNECTOR_NUMBER
+	Type:			int32
+	Flags:			Immutable, Static
+	Range/List:		0-
+
+	Outputs that route their signal to the same connector MUST
+	have the same connector number. Outputs with the same
+	connector number MUST route their signal to the same
+	connector, except if it is 0, which indicates unknown
+	connectivity. 1 is called the primary connector, 2 the
+	secondary. 3 is typically a TV connector, but that is completely
+	driver / hardware dependent.
+	Outputs with the same connector number SHOULD have the same
+	connector type. Meaning and client behavior for mismatching
+	connector types is undefined at the moment.
+
+    "ConnectorType"		aka RR_PROPERTY_CONNECTOR_TYPE
+	Type:			int32 / Atom
+	Flags:			Immutable, Static
+	Range/List:		unknown VGA DVI DVI‐I DVI‐A DVI‐D HDMI Panel
+				TV TV-Composite TV-SVideo TV-Component
+				TV-SCART TV-C4 DisplayPort
+
+	Connector type, as far as known to the driver.
+	Values with dashes (TV‐Composite) describe more specific versions of
+	the base values (TV). The former SHOULD be used if the connector is
+	not capable of producing other signal formats. The later SHOULD be
+	used if the exact connector is unknown, or the connector is a
+	multi‐format connector that is not described otherwise. DVI, for
+	instance, SHOULD be handled like a DVI‐I connector, unless additional
+	information is available to the user agent. PANEL describes
+	laptop‐internal (normally LVDS) displays. TV, TV‐SCART, TV‐Component,
+	and TV‐C4 with signal format VGA are valid combinations and describe
+	RGB TV signals.
+
     "EDID"			aka RR_PROPERTY_RANDR_EDID
 	Type:			int8 [n]
 	Flags:			Immutable
@@ -1454,73 +1521,6 @@ doesn't handle a mandatory property correctly.
 	a signal change (e.g. TV formats).  Clients are allowed to change the
 	properties in order to select a different signal subformat.
 
-    "ConnectorType"		aka RR_PROPERTY_CONNECTOR_TYPE
-	Type:			int32 / Atom
-	Flags:			Immutable, Static
-	Range/List:		unknown VGA DVI DVI‐I DVI‐A DVI‐D HDMI Panel
-				TV TV-Composite TV-SVideo TV-Component
-				TV-SCART TV-C4 DisplayPort
-
-	Connector type, as far as known to the driver.
-	Values with dashes (TV‐Composite) describe more specific versions of
-	the base values (TV). The former SHOULD be used if the connector is
-	not capable of producing other signal formats. The later SHOULD be
-	used if the exact connector is unknown, or the connector is a
-	multi‐format connector that is not described otherwise. DVI, for
-	instance, SHOULD be handled like a DVI‐I connector, unless additional
-	information is available to the user agent. PANEL describes
-	laptop‐internal (normally LVDS) displays. TV, TV‐SCART, TV‐Component,
-	and TV‐C4 with signal format VGA are valid combinations and describe
-	RGB TV signals.
-
-    "ConnectorNumber"		aka RR_PROPERTY_CONNECTOR_NUMBER
-	Type:			int32
-	Flags:			Immutable, Static
-	Range/List:		0-
-
-	Outputs that route their signal to the same connector MUST
-	have the same connector number. Outputs with the same
-	connector number MUST route their signal to the same
-	connector, except if it is 0, which indicates unknown
-	connectivity. 1 is called the primary connector, 2 the
-	secondary. 3 is typically a TV connector, but that is completely
-	driver / hardware dependent.
-	Outputs with the same connector number SHOULD have the same
-	connector type. Meaning and client behavior for mismatching
-	connector types is undefined at the moment.
-
-    "CompatibilityList"		aka RR_PROPERTY_COMPATIBILITY_LIST
-	Type:			int32 [2*n] / Atom pairs
-	Flags:			Immutable
-	Range/List:		0-
-
-	Some combinations of outputs on some cards cannot be served at all,
-	because the according encoder is only capable of driving one output at
-	a time.
-	This property lists all output + signal format pairs that can be
-	driven together with this output. NULL atoms specify any output / any
-	signal format, respectively.
-	This property MUST be symmetric, but may change with changing signal
-	format. I.e. if the property for DVI-1/TMDS specifies VGA-1/VGA to be
-	available, VGA-1/VGA has to list DVI-1/TMDS as well.
-
-    "CloneList"			aka RR_PROPERTY_CLONE_LIST
-	Type:			int32 [2*n] / Atom pairs
-	Flags:			Immutable
-	Range/List:		0-
-
-	Some combinations of outputs on some cards cannot be served
-	independently from each other, because they are wired up to the same
-	encoder outputs.
-	This property lists all output + signal format pairs that are
-	driven together with this output, and thus can only be programmed in
-	clone mode with the same CRTC.
-	This property MUST be symmetric, but may change with changing signal
-	format. I.e. if the property for DVI-1/VGA specifies VGA-1/VGA to be
-	cloned, VGA-1/VGA has to list DVI-1/VGA as well.
-	Outputs / format pairs listed in this property MUST be included in the
-	CompatibilityList.
-
 
 9.2 Properties introduced with version 1.2 of the RandR extension
 
@@ -1535,12 +1535,12 @@ EdidData is provided by the RandR frontend, thus not driver specific.
 
 Property			Immutable	Mandatory since
 ────────			─────────	───────────────
+CloneList			yes		not mandatory
+CompatibilityList		yes		not mandatory
+ConnectorNumber			yes: static	not mandatory
+ConnectorType			yes: static	RandR 1.3
 SignalFormat			no		RandR 1.3
 SignalProperties		no		not mandatory
-ConnectorType			yes: static	RandR 1.3
-ConnectorNumber			yes: static	not mandatory
-CompatibilityList		yes		not mandatory
-CloneList			yes		not mandatory
 
                               ❧❧❧❧❧❧❧❧❧❧❧