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 <aplatt...@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.veli...@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
[ 22240.601]
This is a pre-release version of the X server from The X.Org Foundation.
It is not supported in any way.
Bugs may be filed in the bugzilla at http://bugs.freedesktop.org/.
Select the "xorg" product for bugs you find in this release.
Before reporting bugs in pre-release versions please check the
latest version in the X.Org Foundation git repository.
See http://wiki.x.org/wiki/GitPage for git access instructions.
[ 22240.604]
X.Org X Server 1.19.99.1
Release Date: 2016-11-18
[ 22240.604] X Protocol Version 11, Revision 0
[ 22240.604] Build Operating System: Linux 4.10.13+ x86_64
[ 22240.604] Current Operating System: Linux kaveri 4.10.13+ #254 SMP Mon May 1 11:13:49 JST 2017 x86_64
[ 22240.604] Kernel command line: BOOT_IMAGE=/boot/vmlinuz-4.10.13+ root=/dev/mapper/VG--Debian-LV--sid ro radeon.lockup_timeout=0 radeon.bapm=1 amdgpu.bapm=1 modprobe.blacklist=amdgpu quiet
[ 22240.604] Build Date: 01 May 2017 05:44:28PM
[ 22240.604]
[ 22240.604] Current version of pixman: 0.35.1
[ 22240.604] Before reporting problems, check http://wiki.x.org
to make sure that you have the latest version.
[ 22240.604] Markers: (--) probed, (**) from config file, (==) default setting,
(++) from command line, (!!) notice, (II) informational,
(WW) warning, (EE) error, (NI) not implemented, (??) unknown.
[ 22240.604] (==) Log file: "/usr/local/var/log/Xorg.1.log", Time: Mon May 1 17:51:38 2017
[ 22240.604] (==) Using config file: "/etc/X11/xorg.conf"
[ 22240.604] (==) Using system config directory "/usr/local/share/X11/xorg.conf.d"
[ 22240.604] (==) No Layout section. Using the first Screen section.
[ 22240.604] (==) No screen section available. Using defaults.
[ 22240.604] (**) |-->Screen "Default Screen Section" (0)
[ 22240.604] (**) | |-->Monitor "<default monitor>"
[ 22240.604] (==) No device specified for screen "Default Screen Section".
Using the first device section listed.
[ 22240.604] (**) | |-->Device "Device0"
[ 22240.604] (==) No monitor specified for screen "Default Screen Section".
Using a default monitor configuration.
[ 22240.604] (**) Option "IndirectGLX"
[ 22240.604] (==) Automatically adding devices
[ 22240.604] (==) Automatically enabling devices
[ 22240.604] (==) Automatically adding GPU devices
[ 22240.604] (==) Max clients allowed: 256, resource mask: 0x1fffff
[ 22240.604] (WW) The directory "/usr/share/fonts/X11/TTF/" does not exist.
[ 22240.604] Entry deleted from font path.
[ 22240.604] (WW) The directory "/usr/share/fonts/X11/OTF/" does not exist.
[ 22240.604] Entry deleted from font path.
[ 22240.604] (==) FontPath set to:
/usr/share/fonts/X11/misc/,
/usr/share/fonts/X11/Type1/,
/usr/share/fonts/X11/100dpi/,
/usr/share/fonts/X11/75dpi/
[ 22240.604] (==) ModulePath set to "/usr/local/lib/xorg/modules"
[ 22240.604] (II) The server relies on udev to provide the list of input devices.
If no devices become available, reconfigure udev or disable AutoAddDevices.
[ 22240.604] (II) Loader magic: 0x56298f7d8d20
[ 22240.604] (II) Module ABI versions:
[ 22240.604] X.Org ANSI C Emulation: 0.4
[ 22240.604] X.Org Video Driver: 24.0
[ 22240.605] X.Org XInput driver : 24.1
[ 22240.605] X.Org Server Extension : 10.0
[ 22240.606] (--) using VT number 2
[ 22240.606] (II) systemd-logind: logind integration requires -keeptty and -keeptty was not provided, disabling logind integration
[ 22240.606] (II) xfree86: Adding drm device (/dev/dri/card0)
[ 22240.607] (II) xfree86: Adding drm device (/dev/dri/card1)
[ 22240.610] (--) PCI:*(0:0:1:0) 1002:130f:1043:85cb rev 0, Mem @ 0xd0000000/268435456, 0xf0800000/8388608, 0xfeb00000/262144, I/O @ 0x0000f000/256, BIOS @ 0x????????/131072
[ 22240.610] (--) PCI: (0:1:0:0) 1002:6939:1458:229d rev 0, Mem @ 0xe0000000/268435456, 0xf0000000/2097152, 0xfea00000/262144, I/O @ 0x0000e000/256, BIOS @ 0x????????/131072
[ 22240.610] (II) Open ACPI successful (/var/run/acpid.socket)
[ 22240.610] (II) "glx" will be loaded by default.
[ 22240.610] (II) LoadModule: "glx"
[ 22240.611] (II) Loading /usr/local/lib/xorg/modules/extensions/libglx.so
[ 22240.612] (II) Module glx: vendor="X.Org Foundation"
[ 22240.612] compiled for 1.19.99.1, module version = 1.0.0
[ 22240.612] ABI class: X.Org Server Extension, version 10.0
[ 22240.612] (II) Applying OutputClass "Radeon" to /dev/dri/card0
[ 22240.612] loading driver: radeon
[ 22240.612] (II) Applying OutputClass "AMDgpu" to /dev/dri/card1
[ 22240.612] loading driver: amdgpu
[ 22240.612] (==) Matched radeon as autoconfigured driver 0
[ 22240.612] (==) Matched ati as autoconfigured driver 1
[ 22240.612] (==) Matched amdgpu as autoconfigured driver 2
[ 22240.612] (==) Matched modesetting as autoconfigured driver 3
[ 22240.612] (==) Matched fbdev as autoconfigured driver 4
[ 22240.612] (==) Matched vesa as autoconfigured driver 5
[ 22240.612] (==) Assigned the driver to the xf86ConfigLayout
[ 22240.612] (II) LoadModule: "radeon"
[ 22240.612] (II) Loading /usr/local/lib/xorg/modules/drivers/radeon_drv.so
[ 22240.613] (II) Module radeon: vendor="X.Org Foundation"
[ 22240.613] compiled for 1.19.99.1, module version = 7.9.99
[ 22240.613] Module class: X.Org Video Driver
[ 22240.613] ABI class: X.Org Video Driver, version 24.0
[ 22240.613] (II) RADEON: Driver for ATI/AMD Radeon chipsets:
ATI Radeon Mobility X600 (M24), ATI FireMV 2400,
ATI Radeon Mobility X300 (M24), ATI FireGL M24 GL,
ATI Radeon X600 (RV380), ATI FireGL V3200 (RV380),
ATI Radeon IGP320 (A3), ATI Radeon IGP330/340/350 (A4),
ATI Radeon 9500, ATI Radeon 9600TX, ATI FireGL Z1, ATI Radeon 9800SE,
ATI Radeon 9800, ATI FireGL X2, ATI Radeon 9600, ATI Radeon 9600SE,
ATI Radeon 9600XT, ATI FireGL T2, ATI Radeon 9650, ATI FireGL RV360,
ATI Radeon 7000 IGP (A4+), ATI Radeon 8500 AIW,
ATI Radeon IGP320M (U1), ATI Radeon IGP330M/340M/350M (U2),
ATI Radeon Mobility 7000 IGP, ATI Radeon 9000/PRO, ATI Radeon 9000,
ATI Radeon X800 (R420), ATI Radeon X800PRO (R420),
ATI Radeon X800SE (R420), ATI FireGL X3 (R420),
ATI Radeon Mobility 9800 (M18), ATI Radeon X800 SE (R420),
ATI Radeon X800XT (R420), ATI Radeon X800 VE (R420),
ATI Radeon X850 (R480), ATI Radeon X850 XT (R480),
ATI Radeon X850 SE (R480), ATI Radeon X850 PRO (R480),
ATI Radeon X850 XT PE (R480), ATI Radeon Mobility M7,
ATI Mobility FireGL 7800 M7, ATI Radeon Mobility M6,
ATI FireGL Mobility 9000 (M9), ATI Radeon Mobility 9000 (M9),
ATI Radeon 9700 Pro, ATI Radeon 9700/9500Pro, ATI FireGL X1,
ATI Radeon 9800PRO, ATI Radeon 9800XT,
ATI Radeon Mobility 9600/9700 (M10/M11),
ATI Radeon Mobility 9600 (M10), ATI Radeon Mobility 9600 (M11),
ATI FireGL Mobility T2 (M10), ATI FireGL Mobility T2e (M11),
ATI Radeon, ATI FireGL 8700/8800, ATI Radeon 8500, ATI Radeon 9100,
ATI Radeon 7500, ATI Radeon VE/7000, ATI ES1000,
ATI Radeon Mobility X300 (M22), ATI Radeon Mobility X600 SE (M24C),
ATI FireGL M22 GL, ATI Radeon X800 (R423), ATI Radeon X800PRO (R423),
ATI Radeon X800LE (R423), ATI Radeon X800SE (R423),
ATI Radeon X800 XTP (R430), ATI Radeon X800 XL (R430),
ATI Radeon X800 SE (R430), ATI Radeon X800 (R430),
ATI FireGL V7100 (R423), ATI FireGL V5100 (R423),
ATI FireGL unknown (R423), ATI Mobility FireGL V5000 (M26),
ATI Mobility Radeon X700 XL (M26), ATI Mobility Radeon X700 (M26),
ATI Radeon X550XTX, ATI Radeon 9100 IGP (A5),
ATI Radeon Mobility 9100 IGP (U3), ATI Radeon XPRESS 200,
ATI Radeon XPRESS 200M, ATI Radeon 9250, ATI Radeon 9200,
ATI Radeon 9200SE, ATI FireMV 2200, ATI Radeon X300 (RV370),
ATI Radeon X600 (RV370), ATI Radeon X550 (RV370),
ATI FireGL V3100 (RV370), ATI FireMV 2200 PCIE (RV370),
ATI Radeon Mobility 9200 (M9+), ATI Mobility Radeon X800 XT (M28),
ATI Mobility FireGL V5100 (M28), ATI Mobility Radeon X800 (M28),
ATI Radeon X850, ATI unknown Radeon / FireGL (R480),
ATI Radeon X800XT (R423), ATI FireGL V5000 (RV410),
ATI Radeon X700 XT (RV410), ATI Radeon X700 PRO (RV410),
ATI Radeon X700 SE (RV410), ATI Radeon X700 (RV410),
ATI Radeon X1800, ATI Mobility Radeon X1800 XT,
ATI Mobility Radeon X1800, ATI Mobility FireGL V7200,
ATI FireGL V7200, ATI FireGL V5300, ATI Mobility FireGL V7100,
ATI FireGL V7300, ATI FireGL V7350, ATI Radeon X1600, ATI RV505,
ATI Radeon X1300/X1550, ATI Radeon X1550, ATI M54-GL,
ATI Mobility Radeon X1400, ATI Radeon X1550 64-bit,
ATI Mobility Radeon X1300, ATI Radeon X1300, ATI FireGL V3300,
ATI FireGL V3350, ATI Mobility Radeon X1450,
ATI Mobility Radeon X2300, ATI Mobility Radeon X1350,
ATI FireMV 2250, ATI Radeon X1650, ATI Mobility FireGL V5200,
ATI Mobility Radeon X1600, ATI Radeon X1300 XT/X1600 Pro,
ATI FireGL V3400, ATI Mobility FireGL V5250,
ATI Mobility Radeon X1700, ATI Mobility Radeon X1700 XT,
ATI FireGL V5200, ATI Radeon X2300HD, ATI Mobility Radeon HD 2300,
ATI Radeon X1950, ATI Radeon X1900, ATI AMD Stream Processor,
ATI RV560, ATI Mobility Radeon X1900, ATI Radeon X1950 GT, ATI RV570,
ATI FireGL V7400, ATI Radeon 9100 PRO IGP,
ATI Radeon Mobility 9200 IGP, ATI Radeon X1200, ATI RS740,
ATI RS740M, ATI Radeon HD 2900 XT, ATI Radeon HD 2900 Pro,
ATI Radeon HD 2900 GT, ATI FireGL V8650, ATI FireGL V8600,
ATI FireGL V7600, ATI Radeon 4800 Series, ATI Radeon HD 4870 x2,
ATI Radeon HD 4850 x2, ATI FirePro V8750 (FireGL),
ATI FirePro V7760 (FireGL), ATI Mobility RADEON HD 4850,
ATI Mobility RADEON HD 4850 X2, ATI FirePro RV770,
AMD FireStream 9270, AMD FireStream 9250, ATI FirePro V8700 (FireGL),
ATI Mobility RADEON HD 4870, ATI Mobility RADEON M98,
ATI FirePro M7750, ATI M98, ATI Mobility Radeon HD 4650,
ATI Radeon RV730 (AGP), ATI Mobility Radeon HD 4670,
ATI FirePro M5750, ATI RV730XT [Radeon HD 4670], ATI RADEON E4600,
ATI Radeon HD 4600 Series, ATI RV730 PRO [Radeon HD 4650],
ATI FirePro V7750 (FireGL), ATI FirePro V5700 (FireGL),
ATI FirePro V3750 (FireGL), ATI Mobility Radeon HD 4830,
ATI Mobility Radeon HD 4850, ATI FirePro M7740, ATI RV740,
ATI Radeon HD 4770, ATI Radeon HD 4700 Series, ATI RV610,
ATI Radeon HD 2400 XT, ATI Radeon HD 2400 Pro,
ATI Radeon HD 2400 PRO AGP, ATI FireGL V4000, ATI Radeon HD 2350,
ATI Mobility Radeon HD 2400 XT, ATI Mobility Radeon HD 2400,
ATI RADEON E2400, ATI FireMV 2260, ATI RV670, ATI Radeon HD3870,
ATI Mobility Radeon HD 3850, ATI Radeon HD3850,
ATI Mobility Radeon HD 3850 X2, ATI Mobility Radeon HD 3870,
ATI Mobility Radeon HD 3870 X2, ATI Radeon HD3870 X2,
ATI FireGL V7700, ATI Radeon HD3690, AMD Firestream 9170,
ATI Radeon HD 4550, ATI Radeon RV710, ATI Radeon HD 4350,
ATI Mobility Radeon 4300 Series, ATI Mobility Radeon 4500 Series,
ATI FirePro RG220, ATI Mobility Radeon 4330, ATI RV630,
ATI Mobility Radeon HD 2600, ATI Mobility Radeon HD 2600 XT,
ATI Radeon HD 2600 XT AGP, ATI Radeon HD 2600 Pro AGP,
ATI Radeon HD 2600 XT, ATI Radeon HD 2600 Pro, ATI Gemini RV630,
ATI Gemini Mobility Radeon HD 2600 XT, ATI FireGL V5600,
ATI FireGL V3600, ATI Radeon HD 2600 LE,
ATI Mobility FireGL Graphics Processor, ATI Radeon HD 3470,
ATI Mobility Radeon HD 3430, ATI Mobility Radeon HD 3400 Series,
ATI Radeon HD 3450, ATI Radeon HD 3430, ATI FirePro V3700,
ATI FireMV 2450, ATI Radeon HD 3600 Series, ATI Radeon HD 3650 AGP,
ATI Radeon HD 3600 PRO, ATI Radeon HD 3600 XT,
ATI Mobility Radeon HD 3650, ATI Mobility Radeon HD 3670,
ATI Mobility FireGL V5700, ATI Mobility FireGL V5725,
ATI Radeon HD 3200 Graphics, ATI Radeon 3100 Graphics,
ATI Radeon HD 3300 Graphics, ATI Radeon 3000 Graphics, SUMO, SUMO2,
ATI Radeon HD 4200, ATI Radeon 4100, ATI Mobility Radeon HD 4200,
ATI Mobility Radeon 4100, ATI Radeon HD 4290, ATI Radeon HD 4250,
AMD Radeon HD 6310 Graphics, AMD Radeon HD 6250 Graphics,
AMD Radeon HD 6300 Series Graphics,
AMD Radeon HD 6200 Series Graphics, PALM, CYPRESS,
ATI FirePro (FireGL) Graphics Adapter, AMD Firestream 9370,
AMD Firestream 9350, ATI Radeon HD 5800 Series,
ATI Radeon HD 5900 Series, ATI Mobility Radeon HD 5800 Series,
ATI Radeon HD 5700 Series, ATI Radeon HD 6700 Series,
ATI Mobility Radeon HD 5000 Series, ATI Mobility Radeon HD 5570,
ATI Radeon HD 5670, ATI Radeon HD 5570, ATI Radeon HD 5500 Series,
REDWOOD, ATI Mobility Radeon Graphics, CEDAR, ATI FirePro 2270,
ATI Radeon HD 5450, CAYMAN, AMD Radeon HD 6900 Series,
AMD Radeon HD 6900M Series, Mobility Radeon HD 6000 Series, BARTS,
AMD Radeon HD 6800 Series, AMD Radeon HD 6700 Series, TURKS, CAICOS,
ARUBA, TAHITI, PITCAIRN, VERDE, OLAND, HAINAN, BONAIRE, KABINI,
MULLINS, KAVERI, HAWAII
[ 22240.620] (II) [KMS] Kernel modesetting enabled.
[ 22240.620] (EE) No devices detected.
[ 22240.620] (EE)
Fatal server error:
[ 22240.620] (EE) no screens found(EE)
[ 22240.620] (EE)
Please consult the The X.Org Foundation support
at http://wiki.x.org
for help.
[ 22240.620] (EE) Please also check the log file at "/usr/local/var/log/Xorg.1.log" for additional information.
[ 22240.620] (EE)
[ 22240.629] (EE) Server terminated with error (1). Closing log file.
_______________________________________________
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel
