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

Submitted by Thierry Reding on June 25, 2014, 1:49 p.m.

Details

Message ID 1403704186-31148-3-git-send-email-thierry.reding@gmail.com
State Accepted
Headers show

Not browsing as part of any series.

Commit Message

Thierry Reding June 25, 2014, 1:49 p.m. 
From: Thierry Reding <treding@nvidia.com>

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 467b26b1de1a..8dfcc4f7ef9a 100644
--- a/hw/xfree86/common/xf86platformBus.c
+++ b/hw/xfree86/common/xf86platformBus.c
@@ -401,10 +401,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;
             }
         }

Comments

Rob Clark Aug. 22, 2014, 12:54 a.m. 
On Wed, Jun 25, 2014 at 9:49 AM, Thierry Reding
<thierry.reding@gmail.com> wrote:
> From: Thierry Reding <treding@nvidia.com>
>
> 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>

somehow I missed sending this before, but:

Reviewed-by: Rob Clark <robdclark@gmail.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 467b26b1de1a..8dfcc4f7ef9a 100644
> --- a/hw/xfree86/common/xf86platformBus.c
> +++ b/hw/xfree86/common/xf86platformBus.c
> @@ -401,10 +401,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.0.0
>