start adapting

1 files changed, 4 insertions, 8 deletions

diff --git a/hw/xfree86/common/xf86Imped.c b/hw/xfree86/common/xf86Imped.c
index b6f58382b..62eb357d4 100644
--- a/hw/xfree86/common/xf86Imped.c
+++ b/hw/xfree86/common/xf86Imped.c
@@ -57,13 +57,14 @@ retry:
 	if (xf86GPUScreens[i]->confScreen->screennum != pScreen->myNum)
             continue;
 
+#if 0
 	if (allow_slave) {
             if (!(xf86GPUScreens[i]->roles & RR_Role_Slave_Output))
                 continue;
         }
         else if (!(xf86GPUScreens[i]->roles & RR_Role_Master))
             continue;
-
+#endif
 	if (xf86GPUScreens[i]->numEntities != 1)
             continue;
 
@@ -79,7 +80,7 @@ retry:
             height = xf86GPUScreens[i]->virtualY;
         ErrorF("attaching %s as primary master\n", xf86GPUScreens[i]->driverName);
 	AttachGPU(pScreen, xf86GPUScreens[i]->pScreen);
-        xf86SetCurrentRole(xf86GPUScreens[i], RR_Role_Master);
+	//        xf86SetCurrentRole(xf86GPUScreens[i], RR_Role_Master);
 	break;
     }
     
@@ -96,13 +97,10 @@ retry:
         if (xf86GPUScreens[i]->confScreen->screennum != pScreen->myNum)
             continue;
 
-        if (xf86GPUScreens[i]->current_role)
-            continue;
 
-        if (xf86GPUScreens[i]->roles & RR_Role_Slave_Offload) {
+        if (xf86GPUScreens[i]->capabilities & RR_Capability_SourceOffload) {
             ErrorF("want to attach %s as offload slave\n", xf86GPUScreens[i]->driverName);
             AttachOffloadGPU(master->pScreen, xf86GPUScreens[i]->pScreen);
-            xf86SetCurrentRole(xf86GPUScreens[i], RR_Role_Slave_Offload);
         }
     }
 
@@ -110,8 +108,6 @@ retry:
         if (xf86GPUScreens[i]->confScreen->screennum != pScreen->myNum)
             continue;
 
-        if (xf86GPUScreens[i]->current_role)
-            continue;
         ErrorF("want tot attach %s to unbound list\n", xf86GPUScreens[i]->driverName);
         AttachUnboundGPU(pScreen, xf86GPUScreens[i]->pScreen);
     }