[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CAErSpo5s8ZEk2Lkdj4J2T4pFvSxqxsou0d5efX+7+ecL_wYYMg@mail.gmail.com>
Date: Wed, 26 Dec 2012 15:40:04 -0700
From: Bjorn Helgaas <bhelgaas@...gle.com>
To: Lucas Kannebley Tavares <lucaskt@...ux.vnet.ibm.com>
Cc: dri-devel@...ts.freedesktop.org, David Airlie <airlied@...ux.ie>,
linux-pci@...r.kernel.org, linux-kernel@...r.kernel.org,
brking@...ux.vnet.ibm.com, benh@....ibm.com,
Betty Dall <betty.dall@...com>,
Thadeu Lima de Souza Cascardo <cascardo@...ux.vnet.ibm.com>
Subject: Re: [PATCH] drm: fixed access to PCI host bridges
On Sat, Dec 22, 2012 at 12:01 PM, Lucas Kannebley Tavares
<lucaskt@...ux.vnet.ibm.com> wrote:
> During the process of obtaining the speed cap for the device, it
> attempts go get the PCI Host bus. However on architectures such as PPC
> or IA64, those do not appear as devices.
>
> Signed-off-by: Lucas Kannebley Tavares <lucaskt@...ux.vnet.ibm.com>
> ---
> drivers/gpu/drm/drm_pci.c | 5 +++++
> 1 files changed, 5 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_pci.c b/drivers/gpu/drm/drm_pci.c
> index 754bc96..ea41234 100644
> --- a/drivers/gpu/drm/drm_pci.c
> +++ b/drivers/gpu/drm/drm_pci.c
> @@ -479,8 +479,13 @@ int drm_pcie_get_speed_cap_mask(struct drm_device *dev,
> u32 *mask)
> if (!pci_is_pcie(dev->pdev))
> return -EINVAL;
>
> + // find PCI device for capabilities
> root = dev->pdev->bus->self;
>
> + // some architectures might not have host bridges as PCI devices
> + if (root == NULL)
> + root = dev->pdev;
You didn't address my question about this. Obviously this will avoid
a null pointer dereference. But you have to also explain why this
change is correct.
If it's good enough to just look at the capabilities of the DRM device
(not the upstream bridge) on PPC and ia64, why not do that everywhere
and forget about the bridge completely?
> pos = pci_pcie_cap(root);
> if (!pos)
> return -EINVAL;
>
> --
> Lucas Kannebley Tavares
> Software Engineer
> IBM Linux Technology Center
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists