drm/radeon: add ring working query

Add new ioctl option and bumb minor version number.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Jerome Glisse <jglisse@redhat.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

2 files changed, 19 insertions, 1 deletions

diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
index b500bbc3e411..6e1b2e66e837 100644
--- a/drivers/gpu/drm/radeon/radeon_drv.c
+++ b/drivers/gpu/drm/radeon/radeon_drv.c
@@ -72,9 +72,10 @@
  *   2.29.0 - R500 FP16 color clear registers
  *   2.30.0 - fix for FMASK texturing
  *   2.31.0 - Add fastfb support for rs690
+ *   2.32.0 - new info request for rings working
  */
 #define KMS_DRIVER_MAJOR        2
-#define KMS_DRIVER_MINOR        31
+#define KMS_DRIVER_MINOR        32
 #define KMS_DRIVER_PATCHLEVEL   0
 int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags);
 int 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 8365c75b31b6..3037c38d9aa9 100644
--- a/drivers/gpu/drm/radeon/radeon_kms.c
+++ b/drivers/gpu/drm/radeon/radeon_kms.c
@@ -379,6 +379,23 @@ int radeon_info_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)
         case RADEON_INFO_FASTFB_WORKING:
                 value = rdev->fastfb_working;
                 break;
+        case RADEON_INFO_RING_WORKING:
+                switch (value) {
+                case RADEON_CS_RING_GFX:
+                case RADEON_CS_RING_COMPUTE:
+                        value = rdev->ring[RADEON_RING_TYPE_GFX_INDEX].ready;
+                        break;
+                case RADEON_CS_RING_DMA:
+                        value = rdev->ring[R600_RING_TYPE_DMA_INDEX].ready;
+                        value |= rdev->ring[CAYMAN_RING_TYPE_DMA1_INDEX].ready;
+                        break;
+                case RADEON_CS_RING_UVD:
+                        value = rdev->ring[R600_RING_TYPE_UVD_INDEX].ready;
+                        break;
+                default:
+                        return -EINVAL;
+                }
+                break;
         default:
                 DRM_DEBUG_KMS("Invalid request %d\n", info->request);
                 return -EINVAL;