diff options
| -rw-r--r-- | drivers/gpu/drm/radeon/r600_cs.c | 3 | ||||
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_drv.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/r600_cs.c b/drivers/gpu/drm/radeon/r600_cs.c index 32fbdf9ff265..853f05ced1b1 100644 --- a/drivers/gpu/drm/radeon/r600_cs.c +++ b/drivers/gpu/drm/radeon/r600_cs.c | |||
| @@ -2180,7 +2180,8 @@ static int r600_packet3_check(struct radeon_cs_parser *p, | |||
| 2180 | } | 2180 | } |
| 2181 | break; | 2181 | break; |
| 2182 | case PACKET3_STRMOUT_BASE_UPDATE: | 2182 | case PACKET3_STRMOUT_BASE_UPDATE: |
| 2183 | if (p->family < CHIP_RV770) { | 2183 | /* RS780 and RS880 also need this */ |
| 2184 | if (p->family < CHIP_RS780) { | ||
| 2184 | DRM_ERROR("STRMOUT_BASE_UPDATE only supported on 7xx\n"); | 2185 | DRM_ERROR("STRMOUT_BASE_UPDATE only supported on 7xx\n"); |
| 2185 | return -EINVAL; | 2186 | return -EINVAL; |
| 2186 | } | 2187 | } |
diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c index 8c593ea82c41..2c8b0f849e36 100644 --- a/drivers/gpu/drm/radeon/radeon_drv.c +++ b/drivers/gpu/drm/radeon/radeon_drv.c | |||
| @@ -64,9 +64,10 @@ | |||
| 64 | * 2.20.0 - r600-si: RADEON_INFO_TIMESTAMP query | 64 | * 2.20.0 - r600-si: RADEON_INFO_TIMESTAMP query |
| 65 | * 2.21.0 - r600-r700: FMASK and CMASK | 65 | * 2.21.0 - r600-r700: FMASK and CMASK |
| 66 | * 2.22.0 - r600 only: RESOLVE_BOX allowed | 66 | * 2.22.0 - r600 only: RESOLVE_BOX allowed |
| 67 | * 2.23.0 - allow STRMOUT_BASE_UPDATE on RS780 and RS880 | ||
| 67 | */ | 68 | */ |
| 68 | #define KMS_DRIVER_MAJOR 2 | 69 | #define KMS_DRIVER_MAJOR 2 |
| 69 | #define KMS_DRIVER_MINOR 22 | 70 | #define KMS_DRIVER_MINOR 23 |
| 70 | #define KMS_DRIVER_PATCHLEVEL 0 | 71 | #define KMS_DRIVER_PATCHLEVEL 0 |
| 71 | int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags); | 72 | int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags); |
| 72 | int radeon_driver_unload_kms(struct drm_device *dev); | 73 | int radeon_driver_unload_kms(struct drm_device *dev); |
