diff options
author | Thomas White <taw@bitwiz.org.uk> | 2010-05-22 18:59:58 +0200 |
---|---|---|
committer | Thomas White <taw@bitwiz.org.uk> | 2010-05-22 18:59:58 +0200 |
commit | 69d87612a1b545e6d4cf9fc93117be86f871f7d2 (patch) | |
tree | 6a98d476437bded493b7b9b283291ec50336c482 /drivers/gpu/drm/drm_info.c | |
parent | dd1225cc08c3375bf80289ac1965c724881b149a (diff) |
DRM for platform devices
This modifies the DRM core in a small number of places to allow platform
devices to be used for direct rendering, alongside PCI devices.
Signed-off-by: Thomas White <taw@bitwiz.org.uk>
Diffstat (limited to 'drivers/gpu/drm/drm_info.c')
-rw-r--r-- | drivers/gpu/drm/drm_info.c | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/drivers/gpu/drm/drm_info.c b/drivers/gpu/drm/drm_info.c index f0f6c6b93f3..838c2ee2939 100644 --- a/drivers/gpu/drm/drm_info.c +++ b/drivers/gpu/drm/drm_info.c @@ -52,12 +52,28 @@ int drm_name_info(struct seq_file *m, void *data) return 0; if (master->unique) { - seq_printf(m, "%s %s %s\n", - dev->driver->pci_driver.name, - pci_name(dev->pdev), master->unique); + + if (drm_core_is_platform(dev)) { + seq_printf(m, "%s %s %s\n", + dev->driver->name, + dev_name(&dev->platform_dev->dev), + master->unique); + } else { + seq_printf(m, "%s %s %s\n", + dev->driver->pci_driver.name, + pci_name(dev->pdev), master->unique); + } + } else { - seq_printf(m, "%s %s\n", dev->driver->pci_driver.name, - pci_name(dev->pdev)); + + if (drm_core_is_platform(dev)) { + seq_printf(m, "%s %s\n", dev->driver->name, + dev_name(&dev->platform_dev->dev)); + } else { + seq_printf(m, "%s %s\n", dev->driver->pci_driver.name, + pci_name(dev->pdev)); + } + } return 0; @@ -325,4 +341,3 @@ int drm_vma_info(struct seq_file *m, void *data) } #endif - |