drm/radeon/kms: allow STRMOUT_BASE_UPDATE on RS780 and RS880
Marek Olšák [Mon, 24 Sep 2012 23:45:33 +0000 (01:45 +0200)]
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

drivers/gpu/drm/radeon/r600_cs.c
drivers/gpu/drm/radeon/radeon_drv.c

index 32fbdf9..853f05c 100644 (file)
@@ -2180,7 +2180,8 @@ static int r600_packet3_check(struct radeon_cs_parser *p,
                }
                break;
        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");
                        return -EINVAL;
                }
index 8c593ea..2c8b0f8 100644 (file)
  *   2.20.0 - r600-si: RADEON_INFO_TIMESTAMP query
  *   2.21.0 - r600-r700: FMASK and CMASK
  *   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_MINOR       22
+#define KMS_DRIVER_MINOR       23
 #define KMS_DRIVER_PATCHLEVEL  0
 int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags);
 int radeon_driver_unload_kms(struct drm_device *dev);