diff options
| author | Jorge Zapata <turran@openmoko.com> | 2009-02-19 16:41:58 +0100 |
|---|---|---|
| committer | Thomas White <taw@bitwiz.org.uk> | 2009-03-26 21:34:09 +0000 |
| commit | e1179bc8e2bfa379e178e1f206b4687df71755f1 (patch) | |
| tree | 354e04d8424f19eba0a3ca6eec421a803998a511 /drivers/gpu | |
| parent | d78d95efdfec5a39e470e8e866b864c8fc096c7a (diff) | |
Avoid the high_memory check on arm platforms
Handle correctly the proc/dri/0/name printing
Helper function to check the PLATFORM feature
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/drm_bufs.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/drm_proc.c | 21 |
2 files changed, 16 insertions, 7 deletions
diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c index 72c667f9bee..f56bc66c38a 100644 --- a/drivers/gpu/drm/drm_bufs.c +++ b/drivers/gpu/drm/drm_bufs.c @@ -141,7 +141,7 @@ static int drm_addmap_core(struct drm_device * dev, unsigned int offset, switch (map->type) { case _DRM_REGISTERS: case _DRM_FRAME_BUFFER: -#if !defined(__sparc__) && !defined(__alpha__) && !defined(__ia64__) && !defined(__powerpc64__) && !defined(__x86_64__) +#if !defined(__sparc__) && !defined(__alpha__) && !defined(__ia64__) && !defined(__powerpc64__) && !defined(__x86_64__) && !defined(__arm__) if (map->offset + (map->size-1) < map->offset || map->offset < virt_to_phys(high_memory)) { drm_free(map, sizeof(*map), DRM_MEM_MAPS); diff --git a/drivers/gpu/drm/drm_proc.c b/drivers/gpu/drm/drm_proc.c index 8df849f6683..255b12f9a15 100644 --- a/drivers/gpu/drm/drm_proc.c +++ b/drivers/gpu/drm/drm_proc.c @@ -214,14 +214,23 @@ static int drm_name_info(char *buf, char **start, off_t offset, int request, *eof = 0; if (master->unique) { - DRM_PROC_PRINT("%s %s %s\n", - dev->driver->pci_driver.name, - pci_name(dev->pdev), master->unique); + if (drm_core_is_platform(dev)) { + DRM_PROC_PRINT("%s %s %s\n", dev->driver->name, + dev_name(&dev->platform_dev->dev), master->unique); + } else { + DRM_PROC_PRINT("%s %s %s\n", + dev->driver->pci_driver.name, + pci_name(dev->pdev), master->unique); + } } else { - DRM_PROC_PRINT("%s %s\n", dev->driver->pci_driver.name, - pci_name(dev->pdev)); + if (drm_core_is_platform(dev)) { + DRM_PROC_PRINT("%s %s\n", dev->driver->name, + dev_name(&dev->platform_dev->dev)); + } else { + DRM_PROC_PRINT("%s %s\n", dev->driver->pci_driver.name, + pci_name(dev->pdev)); + } } - if (len > request + offset) return request; *eof = 1; |