frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dri2/prime: allocate prime id at screen allocation time 

Add a static mask of prime id and allocate them at screen time,
if the driver supports the prime interfaces and is a gpu screen.

This is instead of them changing due to user controlled randr commands,
as suggested by Keith.

Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Dave Airlie 2012-07-07 10:10:08 +01:00
parent 3029801216
commit 329db32922
1 changed files with 32 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
hw/xfree86/dri2/dri2.c
View File

@ -51,6 +51,8 @@
CARD8 dri2_major; /* version of DRI2 supported by DDX */ CARD8 dri2_major; /* version of DRI2 supported by DDX */
CARD8 dri2_minor; CARD8 dri2_minor;
uint32_t prime_id_allocate_bitmask;
static DevPrivateKeyRec dri2ScreenPrivateKeyRec; static DevPrivateKeyRec dri2ScreenPrivateKeyRec;
#define dri2ScreenPrivateKey (&dri2ScreenPrivateKeyRec) #define dri2ScreenPrivateKey (&dri2ScreenPrivateKeyRec)
@ -111,6 +113,7 @@ typedef struct _DRI2Screen {
const char *deviceName; const char *deviceName;
int fd; int fd;
unsigned int lastSequence; unsigned int lastSequence;
int prime_id;
DRI2CreateBufferProcPtr CreateBuffer; DRI2CreateBufferProcPtr CreateBuffer;
DRI2DestroyBufferProcPtr DestroyBuffer; DRI2DestroyBufferProcPtr DestroyBuffer;
@ -145,16 +148,15 @@ static ScreenPtr
GetScreenPrime(ScreenPtr master, int prime_id) GetScreenPrime(ScreenPtr master, int prime_id)
{ {
ScreenPtr slave; ScreenPtr slave;
int i;
if (prime_id == 0 || xorg_list_is_empty(&master->offload_slave_list)) { if (prime_id == 0 || xorg_list_is_empty(&master->offload_slave_list)) {
return master; return master;
} }
i = 0;
xorg_list_for_each_entry(slave, &master->offload_slave_list, offload_head) { xorg_list_for_each_entry(slave, &master->offload_slave_list, offload_head) {
if (i == (prime_id - 1)) DRI2ScreenPtr ds;
ds = DRI2GetScreen(slave);
if (ds->prime_id == prime_id)
break; break;
i++;
} }
if (!slave) if (!slave)
return master; return master;
@ -1372,6 +1374,22 @@ DRI2ConfigNotify(WindowPtr pWin, int x, int y, int w, int h, int bw,
return Success; return Success;
} }
#define MAX_PRIME DRI2DriverPrimeMask
static int
get_prime_id(void)
{
int i;
/* start at 1, prime id 0 is just normal driver */
for (i = 1; i < MAX_PRIME; i++) {
if (prime_id_allocate_bitmask & (1 << i))
continue;
prime_id_allocate_bitmask |= (1 << i);
return i;
}
return -1;
}
Bool Bool
DRI2ScreenInit(ScreenPtr pScreen, DRI2InfoPtr info) DRI2ScreenInit(ScreenPtr pScreen, DRI2InfoPtr info)
{ {
@ -1447,6 +1465,13 @@ DRI2ScreenInit(ScreenPtr pScreen, DRI2InfoPtr info)
if (info->version >= 9) { if (info->version >= 9) {
ds->CreateBuffer2 = info->CreateBuffer2; ds->CreateBuffer2 = info->CreateBuffer2;
if (info->CreateBuffer2 && pScreen->isGPU) {
ds->prime_id = get_prime_id();
if (ds->prime_id == -1) {
free(ds);
return FALSE;
}
}
ds->DestroyBuffer2 = info->DestroyBuffer2; ds->DestroyBuffer2 = info->DestroyBuffer2;
ds->CopyRegion2 = info->CopyRegion2; ds->CopyRegion2 = info->CopyRegion2;
} }
@ -1520,6 +1545,8 @@ DRI2CloseScreen(ScreenPtr pScreen)
pScreen->ConfigNotify = ds->ConfigNotify; pScreen->ConfigNotify = ds->ConfigNotify;
if (ds->prime_id)
prime_id_allocate_bitmask &= ~(1 << ds->prime_id);
free(ds->driverNames); free(ds->driverNames);
free(ds); free(ds);
dixSetPrivate(&pScreen->devPrivates, dri2ScreenPrivateKey, NULL); dixSetPrivate(&pScreen->devPrivates, dri2ScreenPrivateKey, NULL);