[Spice-devel] [xf86-video-qxl] More correctly signal that we only want the first head connected at start.

Jeremy White jwhite at codeweavers.com
Wed Mar 20 13:03:45 PDT 2013


This prevents a bug when using old versions of qemu (< 1.2) and the latest
driver version.

Signed-off-by: Jeremy White <jwhite at codeweavers.com>
---
 src/qxl_driver.c   |   10 ----------
 src/qxl_ums_mode.c |    2 +-
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/src/qxl_driver.c b/src/qxl_driver.c
index 1d58f01..b22d5d9 100644
--- a/src/qxl_driver.c
+++ b/src/qxl_driver.c
@@ -610,16 +610,6 @@ qxl_create_screen_resources (ScreenPtr pScreen)
         set_surface (pPixmap, qxl->primary);
     }
 
-    /* HACK - I don't want to enable any crtcs other then the first at the beginning */
-    for (i = 1; i < qxl->num_heads; ++i)
-    {
-	qxl_output_private *private;
-
-	qxl->crtcs[i]->enabled = 0;
-	private = qxl->outputs[i]->driver_private;
-	private->status = XF86OutputStatusDisconnected;
-    }
-    
     qxl_create_desired_modes (qxl);
     qxl_update_edid (qxl);
     
diff --git a/src/qxl_ums_mode.c b/src/qxl_ums_mode.c
index c3bf6de..3827908 100644
--- a/src/qxl_ums_mode.c
+++ b/src/qxl_ums_mode.c
@@ -494,7 +494,7 @@ qxl_init_randr (ScrnInfoPtr pScrn, qxl_screen_t *qxl)
 	output->driver_private = qxl_output;
 	qxl_output->head = i;
 	qxl_output->qxl = qxl;
-	qxl_output->status = XF86OutputStatusConnected;
+	qxl_output->status = i ? XF86OutputStatusDisconnected : XF86OutputStatusConnected;
 	qxl_crtc->output = output;
     }
 
-- 
1.7.10.4




More information about the Spice-devel mailing list