Revision: 4939
http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4939&view=rev
Author: ossman_
Date: 2012-07-18 14:28:58 +0000 (Wed, 18 Jul 2012)
Log Message:
-----------
We need to be able to handle outputs without any CRTC connected as well.
This is generally the state disabled outputs are in.
Modified Paths:
--------------
trunk/unix/xserver/hw/vnc/XserverDesktop.cc
Modified: trunk/unix/xserver/hw/vnc/XserverDesktop.cc
===================================================================
--- trunk/unix/xserver/hw/vnc/XserverDesktop.cc 2012-07-18 14:27:37 UTC (rev
4938)
+++ trunk/unix/xserver/hw/vnc/XserverDesktop.cc 2012-07-18 14:28:58 UTC (rev
4939)
@@ -842,11 +842,35 @@
}
}
- /* Next count how many useful outputs we have... */
+ /*
+ * Next count how many useful outputs we have...
+ *
+ * This gets slightly complicated because we might need to hook a CRTC
+ * up to the output, but also check that we don't try to use the same
+ * CRTC for multiple outputs.
+ */
+ std::set<RRCrtcPtr> usedCrtcs;
availableOutputs = 0;
for (int i = 0;i < rp->numOutputs;i++) {
- if (rp->outputs[i]->crtc != NULL)
+ RROutputPtr output;
+
+ output = rp->outputs[i];
+
+ if (output->crtc != NULL)
availableOutputs++;
+ else {
+ for (int j = 0;j < output->numCrtcs;j++) {
+ if (output->crtcs[j]->numOutputs != 0)
+ continue;
+ if (usedCrtcs.count(output->crtcs[j]) != 0)
+ continue;
+
+ availableOutputs++;
+ usedCrtcs.insert(output->crtcs[j]);
+
+ break;
+ }
+ }
}
/* Try to create more outputs if needed... (only works on Xvnc) */
@@ -884,14 +908,17 @@
output = rp->outputs[i];
crtc = output->crtc;
- /* Useful output? */
- if (crtc == NULL)
- continue;
-
/* Known? */
if (outputIdMap.count(output) == 0)
continue;
+ /* A known output should have a CRTC, but double check... */
+ if (crtc == NULL) {
+ vlog.error("Existing output '%s' has unexpectedly been disabled",
+ output->name);
+ continue;
+ }
+
/* Find the corresponding screen... */
for (iter = layout.begin();iter != layout.end();++iter) {
if (iter->id == outputIdMap[output])
@@ -964,14 +991,33 @@
output = rp->outputs[i];
crtc = output->crtc;
- /* Useful output? */
- if (crtc == NULL)
- continue;
-
/* In use? */
if (outputIdMap.count(output) == 1)
continue;
+ /* Need a CRTC? */
+ if (crtc == NULL) {
+ for (int j = 0;j < output->numCrtcs;j++) {
+ if (output->crtcs[j]->numOutputs != 0)
+ continue;
+
+ crtc = output->crtcs[j];
+ break;
+ }
+
+ /* Couldn't find one... */
+ if (crtc == NULL)
+ continue;
+
+ ret = RRCrtcSet(crtc, NULL, 0, 0, RR_Rotate_0,
+ 1, &output);
+ if (!ret) {
+ vlog.error("Failed to associate a CRTC with output '%s'",
+ output->name);
+ return rfb::resultInvalid;
+ }
+ }
+
break;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Tigervnc-commits mailing list
Tigervnc-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tigervnc-commits
