[PATCH] xfree86: Find primary entity when bus types are nominally different

[Connor Behan]

On 01/10/13 03:58 AM, Laércio de Sousa wrote:
> 2013/9/30 Connor Behan <connor.behan at gmail.com
> <mailto:connor.behan at gmail.com>>
>> As of server 1.13, systems with DRM and Udev will have BUS_PLATFORM as
>> their primary bus type. However, drivers not implementing a
>> platformProbe function will still create entities of type BUS_PCI. We
>> need to account for this when checking for the primary entity.
>>
>> Signed-off-by: Connor Behan <connor.behan at gmail.com
>> <mailto:connor.behan at gmail.com>>
>> ---
>>  hw/xfree86/common/xf86Bus.c | 4 +++-
>>  1 file changed, 3 insertions(+), 1 deletion(-)
>>
>> diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c
>> index e101537..329d0b3 100644
>> --- a/hw/xfree86/common/xf86Bus.c
>> +++ b/hw/xfree86/common/xf86Bus.c
>> @@ -266,7 +266,9 @@ xf86IsEntityPrimary(int entityIndex)
>>  {
>>      EntityPtr pEnt = xf86Entities[entityIndex];
>>
>> -    if (primaryBus.type != pEnt->bus.type)
>> +    if (primaryBus.type == BUS_PLATFORM && pEnt->bus.type == BUS_PCI)
>> +       return MATCH_PCI_DEVICES(pEnt->bus.id.pci,
>> primaryBus.id.plat->pdev);
>> +    else if (primaryBus.type != pEnt->bus.type)
>>          return FALSE;
>>
>>      switch (pEnt->bus.type) {
> Hi Connor!
>
> Is this related?
>
> https://bugs.freedesktop.org/show_bug.cgi?id=66851
Thanks for the link!

I would say these are both regressions that crept into the platform bus
support. I found out about the primary entity problem on a single seat
setup. The int10 module did not find my VBIOS because it thought my
primary card was secondary.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.x.org/archives/xorg-devel/attachments/20131001/6fcf1308/attachment.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 555 bytes
Desc: OpenPGP digital signature
URL: <http://lists.x.org/archives/xorg-devel/attachments/20131001/6fcf1308/attachment.pgp>