diff options
| author | Thomas White <taw@bitwiz.org.uk> | 2009-10-20 15:52:30 +0200 |
|---|---|---|
| committer | Thomas White <taw@bitwiz.org.uk> | 2010-02-09 23:37:32 +0100 |
| commit | 6f3094073277b407b8eda06999c4842dcd0b7045 (patch) | |
| tree | 669754a319e594ff5848c4f95414012a2148e87f /drivers/gpu/drm/drm_info.c | |
| parent | 2f04ffc8dd97e15ce30358c3bf00cf6a0e7dcc19 (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 - |