[RFC,2/2] xfree86: Allow non-PCI devices as primary

Submitted by Thierry Reding on Feb. 13, 2014, 1:50 p.m.

Details

Message ID 1392299404-4135-3-git-send-email-treding@nvidia.com
State Accepted
Commit 5d133276de9c50146e80ffc69edd429c2afe98e6
Headers show

Not browsing as part of any series.

Commit Message

Thierry Reding Feb. 13, 2014, 1:50 p.m. 
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>
---
 hw/xfree86/common/xf86platformBus.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

Patch hide | download patch | download mbox 

diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c
index bd4c9e2f9c81..759b11717e77 100644
--- a/hw/xfree86/common/xf86platformBus.c
+++ b/hw/xfree86/common/xf86platformBus.c
@@ -446,10 +446,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;
             }
         }