diff options
| author | Dave Airlie <airlied@redhat.com> | 2012-08-27 15:22:44 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-11-02 10:17:53 +1000 |
| commit | b87edf1acca7e57139cd6bdf5838c2b4179352dc (patch) | |
| tree | ac5875d166c5078aa2249ea4d5f536d1e2e7b6b6 /hw/xfree86/common | |
| parent | 1e8c960f8777a889fbc17c8711b3e68fd094427b (diff) | |
xf86: fix multi-seat video device support. (v2)
If we are not seat 0 the following apply:
don't probe any bus other than platform
don't probe any drivers other than platform
assume the first platform device we match on the bus is the primary GPU.
This just adds checks in the correct places to ensure this, and
with this X can now start on a secondary seat for an output device.
v2: fix Seat0 macros
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
(cherry picked from commit 70e5766874a919039678bb2ed75f2ccea0cb4345)
Diffstat (limited to 'hw/xfree86/common')
| -rw-r--r-- | hw/xfree86/common/xf86Bus.c | 4 | ||||
| -rw-r--r-- | hw/xfree86/common/xf86platformBus.c | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c index 6de8409fc..4ffbf7e46 100644 --- a/hw/xfree86/common/xf86Bus.c +++ b/hw/xfree86/common/xf86Bus.c @@ -81,6 +81,8 @@ xf86CallDriverProbe(DriverPtr drv, Bool detect_only) if (drv->platformProbe != NULL) { foundScreen = xf86platformProbeDev(drv); } + if (ServerIsNotSeat0()) + return foundScreen; #endif #ifdef XSERVER_LIBPCIACCESS @@ -214,6 +216,8 @@ xf86BusProbe(void) { #ifdef XSERVER_PLATFORM_BUS xf86platformProbe(); + if (ServerIsNotSeat0()) + return; #endif #ifdef XSERVER_LIBPCIACCESS xf86PciProbe(); diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c index 6a8fb907a..0525e39bc 100644 --- a/hw/xfree86/common/xf86platformBus.c +++ b/hw/xfree86/common/xf86platformBus.c @@ -359,6 +359,9 @@ xf86platformProbeDev(DriverPtr drvp) break; } else { + /* for non-seat0 servers assume first device is the master */ + if (ServerIsNotSeat0()) + break; if (xf86_platform_devices[j].pdev) { if (xf86IsPrimaryPlatform(&xf86_platform_devices[j])) break; |