diff options
author | Michel Dänzer <michel.daenzer@amd.com> | 2015-06-16 04:28:16 -0400 |
---|---|---|
committer | Christian König <christian.koenig@amd.com> | 2015-06-18 14:36:56 -0400 |
commit | 3bc980bf19bb62007e923691fa2869ba113be895 (patch) | |
tree | fced0a29999815f8dec8fa037fff20352b3dd2ed | |
parent | 25161084b1c1b0c29948f6f77266a35f302196b7 (diff) |
drm/radeon: Add RADEON_INFO_VA_UNMAP_WORKING query
This tells userspace that it's safe to use the RADEON_VA_UNMAP operation
of the DRM_RADEON_GEM_VA ioctl.
Cc: stable@vger.kernel.org
(NOTE: Backporting this commit requires at least backports of commits
26d4d129b6042197b4cbc8341c0618f99231af2f,
48afbd70ac7b6aa62e8d452091023941d8085f8a and
c29c0876ec05d51a93508a39b90b92c29ba6423d as well, otherwise using
RADEON_VA_UNMAP runs into trouble)
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Christian König <christian.koenig@amd.com>
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_kms.c | 3 | ||||
-rw-r--r-- | include/uapi/drm/radeon_drm.h | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/radeon_kms.c index 7b2a7335cc5d..b0acf50d9558 100644 --- a/drivers/gpu/drm/radeon/radeon_kms.c +++ b/drivers/gpu/drm/radeon/radeon_kms.c | |||
@@ -576,6 +576,9 @@ static int radeon_info_ioctl(struct drm_device *dev, void *data, struct drm_file | |||
576 | if (radeon_get_allowed_info_register(rdev, *value, value)) | 576 | if (radeon_get_allowed_info_register(rdev, *value, value)) |
577 | return -EINVAL; | 577 | return -EINVAL; |
578 | break; | 578 | break; |
579 | case RADEON_INFO_VA_UNMAP_WORKING: | ||
580 | *value = true; | ||
581 | break; | ||
579 | default: | 582 | default: |
580 | DRM_DEBUG_KMS("Invalid request %d\n", info->request); | 583 | DRM_DEBUG_KMS("Invalid request %d\n", info->request); |
581 | return -EINVAL; | 584 | return -EINVAL; |
diff --git a/include/uapi/drm/radeon_drm.h b/include/uapi/drm/radeon_drm.h index 871e73f99a4d..94d44ab2fda1 100644 --- a/include/uapi/drm/radeon_drm.h +++ b/include/uapi/drm/radeon_drm.h | |||
@@ -1038,6 +1038,7 @@ struct drm_radeon_cs { | |||
1038 | #define RADEON_INFO_CURRENT_GPU_SCLK 0x22 | 1038 | #define RADEON_INFO_CURRENT_GPU_SCLK 0x22 |
1039 | #define RADEON_INFO_CURRENT_GPU_MCLK 0x23 | 1039 | #define RADEON_INFO_CURRENT_GPU_MCLK 0x23 |
1040 | #define RADEON_INFO_READ_REG 0x24 | 1040 | #define RADEON_INFO_READ_REG 0x24 |
1041 | #define RADEON_INFO_VA_UNMAP_WORKING 0x25 | ||
1041 | 1042 | ||
1042 | struct drm_radeon_info { | 1043 | struct drm_radeon_info { |
1043 | uint32_t request; | 1044 | uint32_t request; |