diff options
author | Christian König <christian.koenig@amd.com> | 2013-04-16 16:11:37 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2014-08-27 12:48:01 -0400 |
commit | 14e935aeb0213e2ef522d0d8a14d2d29fb194956 (patch) | |
tree | cba60d001acb5fb52d7bdc7b21fbec39c104f065 /drivers/gpu/drm/radeon/radeon_uvd.c | |
parent | 32517d59ebb3b6eb7a5a5736020072ce7e609e76 (diff) |
drm/radeon: add UVD fw names for older asic
Activating the UVD support.
Signed-off-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_uvd.c')
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_uvd.c | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_uvd.c b/drivers/gpu/drm/radeon/radeon_uvd.c index 341848a14376..a6ebaf0bda15 100644 --- a/drivers/gpu/drm/radeon/radeon_uvd.c +++ b/drivers/gpu/drm/radeon/radeon_uvd.c | |||
@@ -40,12 +40,18 @@ | |||
40 | #define UVD_IDLE_TIMEOUT_MS 1000 | 40 | #define UVD_IDLE_TIMEOUT_MS 1000 |
41 | 41 | ||
42 | /* Firmware Names */ | 42 | /* Firmware Names */ |
43 | #define FIRMWARE_R600 "radeon/R600_uvd.bin" | ||
44 | #define FIRMWARE_RS780 "radeon/RS780_uvd.bin" | ||
45 | #define FIRMWARE_RV770 "radeon/RV770_uvd.bin" | ||
43 | #define FIRMWARE_RV710 "radeon/RV710_uvd.bin" | 46 | #define FIRMWARE_RV710 "radeon/RV710_uvd.bin" |
44 | #define FIRMWARE_CYPRESS "radeon/CYPRESS_uvd.bin" | 47 | #define FIRMWARE_CYPRESS "radeon/CYPRESS_uvd.bin" |
45 | #define FIRMWARE_SUMO "radeon/SUMO_uvd.bin" | 48 | #define FIRMWARE_SUMO "radeon/SUMO_uvd.bin" |
46 | #define FIRMWARE_TAHITI "radeon/TAHITI_uvd.bin" | 49 | #define FIRMWARE_TAHITI "radeon/TAHITI_uvd.bin" |
47 | #define FIRMWARE_BONAIRE "radeon/BONAIRE_uvd.bin" | 50 | #define FIRMWARE_BONAIRE "radeon/BONAIRE_uvd.bin" |
48 | 51 | ||
52 | MODULE_FIRMWARE(FIRMWARE_R600); | ||
53 | MODULE_FIRMWARE(FIRMWARE_RS780); | ||
54 | MODULE_FIRMWARE(FIRMWARE_RV770); | ||
49 | MODULE_FIRMWARE(FIRMWARE_RV710); | 55 | MODULE_FIRMWARE(FIRMWARE_RV710); |
50 | MODULE_FIRMWARE(FIRMWARE_CYPRESS); | 56 | MODULE_FIRMWARE(FIRMWARE_CYPRESS); |
51 | MODULE_FIRMWARE(FIRMWARE_SUMO); | 57 | MODULE_FIRMWARE(FIRMWARE_SUMO); |
@@ -63,6 +69,23 @@ int radeon_uvd_init(struct radeon_device *rdev) | |||
63 | INIT_DELAYED_WORK(&rdev->uvd.idle_work, radeon_uvd_idle_work_handler); | 69 | INIT_DELAYED_WORK(&rdev->uvd.idle_work, radeon_uvd_idle_work_handler); |
64 | 70 | ||
65 | switch (rdev->family) { | 71 | switch (rdev->family) { |
72 | case CHIP_RV610: | ||
73 | case CHIP_RV630: | ||
74 | case CHIP_RV670: | ||
75 | case CHIP_RV620: | ||
76 | case CHIP_RV635: | ||
77 | fw_name = FIRMWARE_R600; | ||
78 | break; | ||
79 | |||
80 | case CHIP_RS780: | ||
81 | case CHIP_RS880: | ||
82 | fw_name = FIRMWARE_RS780; | ||
83 | break; | ||
84 | |||
85 | case CHIP_RV770: | ||
86 | fw_name = FIRMWARE_RV770; | ||
87 | break; | ||
88 | |||
66 | case CHIP_RV710: | 89 | case CHIP_RV710: |
67 | case CHIP_RV730: | 90 | case CHIP_RV730: |
68 | case CHIP_RV740: | 91 | case CHIP_RV740: |