]>
Commit | Line | Data |
---|---|---|
9d464dfd GKH |
1 | From 46fc8781bf428ce1094a5980ca2b92a49d33a8ca Mon Sep 17 00:00:00 2001 |
2 | From: Marek Olšák <maraeo@gmail.com> | |
3 | Date: Tue, 25 Sep 2012 01:45:33 +0200 | |
4 | Subject: drm/radeon/kms: allow STRMOUT_BASE_UPDATE on RS780 and RS880 | |
5 | ||
6 | From: Marek Olšák <maraeo@gmail.com> | |
7 | ||
8 | commit 46fc8781bf428ce1094a5980ca2b92a49d33a8ca upstream. | |
9 | ||
10 | This is required to make streamout work there. | |
11 | ||
12 | Signed-off-by: Marek Olšák <maraeo@gmail.com> | |
13 | Signed-off-by: Alex Deucher <alexander.deucher@amd.com> | |
14 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
15 | ||
16 | --- | |
17 | drivers/gpu/drm/radeon/r600_cs.c | 3 ++- | |
18 | drivers/gpu/drm/radeon/radeon_drv.c | 3 ++- | |
19 | 2 files changed, 4 insertions(+), 2 deletions(-) | |
20 | ||
21 | --- a/drivers/gpu/drm/radeon/r600_cs.c | |
22 | +++ b/drivers/gpu/drm/radeon/r600_cs.c | |
23 | @@ -2180,7 +2180,8 @@ static int r600_packet3_check(struct rad | |
24 | } | |
25 | break; | |
26 | case PACKET3_STRMOUT_BASE_UPDATE: | |
27 | - if (p->family < CHIP_RV770) { | |
28 | + /* RS780 and RS880 also need this */ | |
29 | + if (p->family < CHIP_RS780) { | |
30 | DRM_ERROR("STRMOUT_BASE_UPDATE only supported on 7xx\n"); | |
31 | return -EINVAL; | |
32 | } | |
33 | --- a/drivers/gpu/drm/radeon/radeon_drv.c | |
34 | +++ b/drivers/gpu/drm/radeon/radeon_drv.c | |
35 | @@ -64,9 +64,10 @@ | |
36 | * 2.20.0 - r600-si: RADEON_INFO_TIMESTAMP query | |
37 | * 2.21.0 - r600-r700: FMASK and CMASK | |
38 | * 2.22.0 - r600 only: RESOLVE_BOX allowed | |
39 | + * 2.23.0 - allow STRMOUT_BASE_UPDATE on RS780 and RS880 | |
40 | */ | |
41 | #define KMS_DRIVER_MAJOR 2 | |
42 | -#define KMS_DRIVER_MINOR 22 | |
43 | +#define KMS_DRIVER_MINOR 23 | |
44 | #define KMS_DRIVER_PATCHLEVEL 0 | |
45 | int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags); | |
46 | int radeon_driver_unload_kms(struct drm_device *dev); |