[PATCH] Improved autoconfig drivers matching

[Michel Dänzer]

On 28/04/17 04:11 AM, Adam Jackson wrote:
> On Wed, 2017-04-12 at 23:42 +0100, Emil Velikov wrote:
>>> On 12 April 2017 at 23:05, Aaron Plattner <aplattner at nvidia.com> wrote:
>>> On 07/12/2016 04:31 PM, Emil Velikov wrote:
>>>> Since xf86platformBus.h is part of the SDK, If we do this, then the
>>>> new header must become one as well (should be listed in sdk_HEADERS).
>>>> Alternatively we can forward declare XF86MatchedDrivers and include
>>>> the header in EXTRA_DIST. Not sure if the latter is a good idea
>>>> though, since the actual ABI will be undefined/private.
>>>>
>>>> Or better yet, neither of the two exported symbols
>>>> (xf86PlatformDeviceCheckBusID, xf86PlatformMatchDriver) is used and
>>>> imho we can remove them. Seems that the header is used solely for the
>>>> ODEV management, which isn't platform devices specific and one can
>>>> just move those parts into a separate header and use _it_ in the SDK ?
>>>>
>>>> But all that (everything but the sdk_HEADERS/EXTRA_DIST fix) is added
>>>> bogus, which shouldn't stop the patch from landing.
>>> Another customer ran into this recently. Adam, can this be merged? I don't
>>> think Emil's reply was a nack.
>>
>> Precisely. My earlier message should have read:
>>
>> xf86MatchDrivers.h must be in the sdk_HEADERS or you'll need build
>> hacks in each driver. With that the patch is
>> Reviewed-by: Emil Velikov <emil.l.velikov at gmail.com>
> 
> Fixed up (and rebased and made meson-aware) and merged:
> 
> To ssh://git.freedesktop.org/git/xorg/xserver
>    1549e3037..112d0d7d0  master -> master

This broke things on my development box.

There are two GPUs. When I want Xorg to use the secondary GPU for its
primary screen, I use a xorg.conf with (effectively) only:

Section "Device"
        Identifier "Device0"
        BusID   "PCI:1:0:0"
EndSection

Before this change, this worked fine, automatically[0] using the amdgpu
driver for that GPU. With this change, Xorg fails to start up, see the
attached log file.


FWIW, if I comment out the BusID stanza, Xorg still starts up fine using
the radeon driver for the primary GPU.


[0] via /usr/local/share/X11/xorg.conf.d/10-amdgpu.conf, which contains

Section "OutputClass"
	Identifier "AMDgpu"
	MatchDriver "amdgpu"
	Driver "amdgpu"
EndSection


-- 
Earthling Michel Dänzer               |               http://www.amd.com
Libre software enthusiast             |             Mesa and X developer
-------------- next part --------------
A non-text attachment was scrubbed...
Name: Xorg.1.log
Type: text/x-log
Size: 12859 bytes
Desc: not available
URL: <https://lists.x.org/archives/xorg-devel/attachments/20170501/1db155e8/attachment.bin>