38 lines
1.3 KiB
Diff
38 lines
1.3 KiB
Diff
|
From 570ce9d0e7cfc06cd8892a5aab471768aaa9b2f1 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Thierry Reding <treding@nvidia.com>
|
||
|
|
Date: Thu, 13 Feb 2014 13:36:12 +0100
|
||
|
|
Subject: [PATCH v2 2/2] xfree86: Allow non-PCI devices as primary
|
||
|
|
|
||
|
|
On platforms that don't support PCI or have no GPU attached to the PCI
|
||
|
|
bus, there can still be a primary device on a non-PCI bus.
|
||
|
|
|
||
|
|
Signed-off-by: Thierry Reding <treding@nvidia.com>
|
||
|
|
Reviewed-by: Rob Clark <robdclark@gmail.com>
|
||
|
|
Tested-by: Rob Clark <robdclark@gmail.com>
|
||
|
|
Signed-off-by: Keith Packard <keithp@keithp.com>
|
||
|
|
---
|
||
|
|
hw/xfree86/common/xf86platformBus.c | 7 +++----
|
||
|
|
1 file changed, 3 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c
|
||
|
|
index 74d63c2..fe0880e 100644
|
||
|
|
--- a/hw/xfree86/common/xf86platformBus.c
|
||
|
|
+++ b/hw/xfree86/common/xf86platformBus.c
|
||
|
|
@@ -476,10 +476,9 @@ xf86platformProbeDev(DriverPtr drvp)
|
||
|
|
/* 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;
|
||
|
|
- }
|
||
|
|
+
|
||
|
|
+ if (xf86IsPrimaryPlatform(&xf86_platform_devices[j]))
|
||
|
|
+ break;
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|
||
|
|
--
|
||
|
|
2.1.0
|
||
|
|
|