aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorTom Stellard <tstellar@gmail.com>2012-03-20 17:17:55 -0400
committerDave Airlie <airlied@redhat.com>2012-03-21 02:55:49 -0400
commit609c1e15a44c25f722fb93e18668da30179a172f (patch)
tree4fb8f7faf5d5bb5e7df05b4fd04d4028ba702152 /drivers/gpu
parentda0df92b57311aa1b26a2a90599ed16e1e968b90 (diff)
drm/radeon/kms: add info query for max pipes
The maximum number of pipes is needed by the user space compute driver to calculate the number of wavefronts per thread group. Signed-off-by: Tom Stellard <thomas.stellard@amd.com> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/radeon/radeon_drv.c3
-rw-r--r--drivers/gpu/drm/radeon/radeon_kms.c13
2 files changed, 15 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
index 498d21d50ba3..ef7bb3f6ecae 100644
--- a/drivers/gpu/drm/radeon/radeon_drv.c
+++ b/drivers/gpu/drm/radeon/radeon_drv.c
@@ -56,9 +56,10 @@
56 * 2.12.0 - RADEON_CS_KEEP_TILING_FLAGS 56 * 2.12.0 - RADEON_CS_KEEP_TILING_FLAGS
57 * 2.13.0 - virtual memory support, streamout 57 * 2.13.0 - virtual memory support, streamout
58 * 2.14.0 - add evergreen tiling informations 58 * 2.14.0 - add evergreen tiling informations
59 * 2.15.0 - add max_pipes query
59 */ 60 */
60#define KMS_DRIVER_MAJOR 2 61#define KMS_DRIVER_MAJOR 2
61#define KMS_DRIVER_MINOR 14 62#define KMS_DRIVER_MINOR 15
62#define KMS_DRIVER_PATCHLEVEL 0 63#define KMS_DRIVER_PATCHLEVEL 0
63int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags); 64int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags);
64int radeon_driver_unload_kms(struct drm_device *dev); 65int radeon_driver_unload_kms(struct drm_device *dev);
diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/radeon_kms.c
index 1986ebae1ef2..72d70eb04a17 100644
--- a/drivers/gpu/drm/radeon/radeon_kms.c
+++ b/drivers/gpu/drm/radeon/radeon_kms.c
@@ -264,6 +264,19 @@ int radeon_info_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)
264 return -EINVAL; 264 return -EINVAL;
265 value = RADEON_IB_VM_MAX_SIZE; 265 value = RADEON_IB_VM_MAX_SIZE;
266 break; 266 break;
267 case RADEON_INFO_MAX_PIPES:
268 if (rdev->family >= CHIP_CAYMAN)
269 value = rdev->config.cayman.max_pipes_per_simd;
270 else if (rdev->family >= CHIP_CEDAR)
271 value = rdev->config.evergreen.max_pipes;
272 else if (rdev->family >= CHIP_RV770)
273 value = rdev->config.rv770.max_pipes;
274 else if (rdev->family >= CHIP_R600)
275 value = rdev->config.r600.max_pipes;
276 else {
277 return -EINVAL;
278 }
279 break;
267 default: 280 default:
268 DRM_DEBUG_KMS("Invalid request %d\n", info->request); 281 DRM_DEBUG_KMS("Invalid request %d\n", info->request);
269 return -EINVAL; 282 return -EINVAL;