diff options
-rw-r--r-- | hw/xfree86/common/xf86DrvHelper.c | 11 | ||||
-rw-r--r-- | include/scrnintstr.h | 4 |
2 files changed, 5 insertions, 10 deletions
diff --git a/hw/xfree86/common/xf86DrvHelper.c b/hw/xfree86/common/xf86DrvHelper.c index 9c5b03fcd..189f65ba8 100644 --- a/hw/xfree86/common/xf86DrvHelper.c +++ b/hw/xfree86/common/xf86DrvHelper.c @@ -54,10 +54,10 @@ retry: continue; if (allow_slave) { - if (!(xf86GPUScreens[i]->roles & ROLE_SLAVE_OUTPUT)) + if (!(xf86GPUScreens[i]->roles & RR_Role_Slave_Output)) continue; } - else if (!(xf86GPUScreens[i]->roles & ROLE_MASTER)) + else if (!(xf86GPUScreens[i]->roles & RR_Role_Master)) continue; if (xf86GPUScreens[i]->numEntities != 1) @@ -75,10 +75,9 @@ retry: height = xf86GPUScreens[i]->virtualY; ErrorF("attaching %s as primary master\n", xf86GPUScreens[i]->driverName); impedAttachScreen(pScreen, xf86GPUScreens[i]->pScreen); - xf86GPUScreens[i]->current_role = ROLE_MASTER; + xf86SetCurrentRole(xf86GPUScreens[i], RR_Role_Master); break; } - if (!master && !allow_slave) { allow_slave = TRUE; @@ -96,10 +95,10 @@ retry: if (xf86GPUScreens[i]->current_role) continue; - if (xf86GPUScreens[i]->roles & ROLE_SLAVE_OFFLOAD) { + if (xf86GPUScreens[i]->roles & RR_Role_Slave_Offload) { ErrorF("want to attach %s as offload slave\n", xf86GPUScreens[i]->driverName); impedAttachOffloadSlave(master->pScreen, xf86GPUScreens[i]->pScreen, 0); - xf86GPUScreens[i]->current_role = ROLE_SLAVE_OFFLOAD; + xf86SetCurrentRole(xf86GPUScreens[i], RR_Role_Slave_Offload); } } diff --git a/include/scrnintstr.h b/include/scrnintstr.h index e7578933f..c9f2d0bae 100644 --- a/include/scrnintstr.h +++ b/include/scrnintstr.h @@ -57,10 +57,6 @@ SOFTWARE. #include "privates.h" #include "mi.h" -#define ROLE_MASTER 0x1 -#define ROLE_SLAVE_OFFLOAD 0x2 -#define ROLE_SLAVE_OUTPUT 0x4 - typedef struct _PixmapFormat { unsigned char depth; unsigned char bitsPerPixel; |