openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

drm/radeon/kms: allow STRMOUT_BASE_UPDATE on RS780 and RS880 

This is required to make streamout work there.

Signed-off-by: Marek Olšák <maraeo@gmail.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
This commit is contained in:
Marek Olšák 2012-09-25 01:45:33 +02:00 committed by Alex Deucher
parent fa87e62d35
commit 46fc8781bf
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/gpu/drm/radeon/r600_cs.c
View File

@ -2180,7 +2180,8 @@ static int r600_packet3_check(struct radeon_cs_parser *p,
} }
break; break;
case PACKET3_STRMOUT_BASE_UPDATE: case PACKET3_STRMOUT_BASE_UPDATE:
if (p->family < CHIP_RV770) { /* RS780 and RS880 also need this */
if (p->family < CHIP_RS780) {
DRM_ERROR("STRMOUT_BASE_UPDATE only supported on 7xx\n"); DRM_ERROR("STRMOUT_BASE_UPDATE only supported on 7xx\n");
return -EINVAL; return -EINVAL;
} }

3
drivers/gpu/drm/radeon/radeon_drv.c
View File

@ -64,9 +64,10 @@
* 2.20.0 - r600-si: RADEON_INFO_TIMESTAMP query * 2.20.0 - r600-si: RADEON_INFO_TIMESTAMP query
* 2.21.0 - r600-r700: FMASK and CMASK * 2.21.0 - r600-r700: FMASK and CMASK
* 2.22.0 - r600 only: RESOLVE_BOX allowed * 2.22.0 - r600 only: RESOLVE_BOX allowed
* 2.23.0 - allow STRMOUT_BASE_UPDATE on RS780 and RS880
*/ */
#define KMS_DRIVER_MAJOR 2 #define KMS_DRIVER_MAJOR 2
#define KMS_DRIVER_MINOR 22 #define KMS_DRIVER_MINOR 23
#define KMS_DRIVER_PATCHLEVEL 0 #define KMS_DRIVER_PATCHLEVEL 0
int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags); int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags);
int radeon_driver_unload_kms(struct drm_device *dev); int radeon_driver_unload_kms(struct drm_device *dev);