fbdev: make entity fail if PCI claimed already.
bad kitty fbdev, been shipping this in Fedora for a while now
This commit is contained in:
parent
3efb23a6c4
commit
aef6b904eb
|
@ -428,6 +428,9 @@ xf86GetEntityInfo(int entityIndex)
|
||||||
EntityInfoPtr pEnt;
|
EntityInfoPtr pEnt;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
|
if (entityIndex == -1)
|
||||||
|
return NULL;
|
||||||
|
|
||||||
if (entityIndex >= xf86NumEntities)
|
if (entityIndex >= xf86NumEntities)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
|
|
|
@ -57,6 +57,13 @@ xf86ClaimFbSlot(DriverPtr drvp, int chipset, GDevPtr dev, Bool active)
|
||||||
{
|
{
|
||||||
EntityPtr p;
|
EntityPtr p;
|
||||||
int num;
|
int num;
|
||||||
|
|
||||||
|
if (pciSlotClaimed)
|
||||||
|
return -1;
|
||||||
|
#if defined(__sparc__) || defined (__sparc64__)
|
||||||
|
if (sbusSlotClaimed)
|
||||||
|
return -1;
|
||||||
|
#endif
|
||||||
|
|
||||||
num = xf86AllocateEntity();
|
num = xf86AllocateEntity();
|
||||||
p = xf86Entities[num];
|
p = xf86Entities[num];
|
||||||
|
|
Loading…
Reference in New Issue
Block a user