1 files changed, 29 insertions, 1 deletions

diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/radeon_kms.c
index 66ed3ea71440..3e49342a20e6 100644
--- a/drivers/gpu/drm/radeon/radeon_kms.c
+++ b/drivers/gpu/drm/radeon/radeon_kms.c
@@ -441,6 +441,9 @@ static int radeon_info_ioctl(struct drm_device *dev, void *data, struct drm_file
                 case RADEON_CS_RING_UVD:
                         *value = rdev->ring[R600_RING_TYPE_UVD_INDEX].ready;
                         break;
+                case RADEON_CS_RING_VCE:
+                        *value = rdev->ring[TN_RING_TYPE_VCE1_INDEX].ready;
+                        break;
                 default:
                         return -EINVAL;
                 }
@@ -485,6 +488,27 @@ static int radeon_info_ioctl(struct drm_device *dev, void *data, struct drm_file
                 else
                         *value = rdev->pm.default_sclk * 10;
                 break;
+        case RADEON_INFO_VCE_FW_VERSION:
+                *value = rdev->vce.fw_version;
+                break;
+        case RADEON_INFO_VCE_FB_VERSION:
+                *value = rdev->vce.fb_version;
+                break;
+        case RADEON_INFO_NUM_BYTES_MOVED:
+                value = (uint32_t*)&value64;
+                value_size = sizeof(uint64_t);
+                value64 = atomic64_read(&rdev->num_bytes_moved);
+                break;
+        case RADEON_INFO_VRAM_USAGE:
+                value = (uint32_t*)&value64;
+                value_size = sizeof(uint64_t);
+                value64 = atomic64_read(&rdev->vram_usage);
+                break;
+        case RADEON_INFO_GTT_USAGE:
+                value = (uint32_t*)&value64;
+                value_size = sizeof(uint64_t);
+                value64 = atomic64_read(&rdev->gtt_usage);
+                break;
         default:
                 DRM_DEBUG_KMS("Invalid request %d\n", info->request);
                 return -EINVAL;
@@ -543,7 +567,9 @@ int radeon_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv)
                         return -ENOMEM;
                 }
 
-                radeon_vm_init(rdev, &fpriv->vm);
+                r = radeon_vm_init(rdev, &fpriv->vm);
+                if (r)
+                        return r;
 
                 r = radeon_bo_reserve(rdev->ring_tmp_bo.bo, false);
                 if (r)
@@ -624,6 +650,7 @@ void radeon_driver_preclose_kms(struct drm_device *dev,
         if (rdev->cmask_filp == file_priv)
                 rdev->cmask_filp = NULL;
         radeon_uvd_free_handles(rdev, file_priv);
+        radeon_vce_free_handles(rdev, file_priv);
 }
 
 /*
@@ -818,5 +845,6 @@ const struct drm_ioctl_desc radeon_ioctls_kms[] = {
         DRM_IOCTL_DEF_DRV(RADEON_GEM_GET_TILING, radeon_gem_get_tiling_ioctl, DRM_AUTH|DRM_UNLOCKED|DRM_RENDER_ALLOW),
         DRM_IOCTL_DEF_DRV(RADEON_GEM_BUSY, radeon_gem_busy_ioctl, DRM_AUTH|DRM_UNLOCKED|DRM_RENDER_ALLOW),
         DRM_IOCTL_DEF_DRV(RADEON_GEM_VA, radeon_gem_va_ioctl, DRM_AUTH|DRM_UNLOCKED|DRM_RENDER_ALLOW),
+        DRM_IOCTL_DEF_DRV(RADEON_GEM_OP, radeon_gem_op_ioctl, DRM_AUTH|DRM_UNLOCKED|DRM_RENDER_ALLOW),
 };
 int radeon_max_kms_ioctl = DRM_ARRAY_SIZE(radeon_ioctls_kms);