diff options
author | Leo Liu <leo.liu@amd.com> | 2015-03-31 11:19:50 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2015-04-08 18:03:48 -0400 |
commit | 1957d6bed15fd7635c2867f7c21c17e6baa9a672 (patch) | |
tree | b61f5140a91d317002c100c4f7108201fa1983bc | |
parent | 1d8ac08d498d579aae36221a80b4b724b2f52f39 (diff) |
drm/radeon: add video usability info support for VCE
v2: bump version to make sure userspace backward compatibility
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Leo Liu <leo.liu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_drv.c | 3 | ||||
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_vce.c | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c index d688f6cd1ae4..7d620d4b3f31 100644 --- a/drivers/gpu/drm/radeon/radeon_drv.c +++ b/drivers/gpu/drm/radeon/radeon_drv.c | |||
@@ -89,9 +89,10 @@ | |||
89 | * 2.40.0 - Add RADEON_GEM_GTT_WC/UC, flush HDP cache before submitting | 89 | * 2.40.0 - Add RADEON_GEM_GTT_WC/UC, flush HDP cache before submitting |
90 | * CS to GPU on >= r600 | 90 | * CS to GPU on >= r600 |
91 | * 2.41.0 - evergreen/cayman: Add SET_BASE/DRAW_INDIRECT command parsing support | 91 | * 2.41.0 - evergreen/cayman: Add SET_BASE/DRAW_INDIRECT command parsing support |
92 | * 2.42.0 - Add VCE/VUI (Video Usability Information) support | ||
92 | */ | 93 | */ |
93 | #define KMS_DRIVER_MAJOR 2 | 94 | #define KMS_DRIVER_MAJOR 2 |
94 | #define KMS_DRIVER_MINOR 41 | 95 | #define KMS_DRIVER_MINOR 42 |
95 | #define KMS_DRIVER_PATCHLEVEL 0 | 96 | #define KMS_DRIVER_PATCHLEVEL 0 |
96 | int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags); | 97 | int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags); |
97 | int radeon_driver_unload_kms(struct drm_device *dev); | 98 | int radeon_driver_unload_kms(struct drm_device *dev); |
diff --git a/drivers/gpu/drm/radeon/radeon_vce.c b/drivers/gpu/drm/radeon/radeon_vce.c index 976fe432f4e2..24f849f888bb 100644 --- a/drivers/gpu/drm/radeon/radeon_vce.c +++ b/drivers/gpu/drm/radeon/radeon_vce.c | |||
@@ -571,6 +571,7 @@ int radeon_vce_cs_parse(struct radeon_cs_parser *p) | |||
571 | case 0x04000005: // rate control | 571 | case 0x04000005: // rate control |
572 | case 0x04000007: // motion estimation | 572 | case 0x04000007: // motion estimation |
573 | case 0x04000008: // rdo | 573 | case 0x04000008: // rdo |
574 | case 0x04000009: // vui | ||
574 | break; | 575 | break; |
575 | 576 | ||
576 | case 0x03000001: // encode | 577 | case 0x03000001: // encode |