diff options
| author | Oded Gabbay <oded.gabbay@gmail.com> | 2015-01-19 09:20:21 -0500 |
|---|---|---|
| committer | Oded Gabbay <oded.gabbay@gmail.com> | 2015-07-20 02:16:47 -0400 |
| commit | 22801f76fa59870aed2c0b8a4eb6c8d6993347ae (patch) | |
| tree | b680aac35b996173de6ed84c4108e3afad65a246 /drivers/gpu/drm | |
| parent | 52721d9d3334c1cb1f76219a161084094ec634dc (diff) | |
drm/radeon: Modify kgd_engine_type enum to match CZ
This patch splits the KGD_ENGINE_SDMA to KGD_ENGINE_SDMA1 and
KGD_ENGINE_SDMA2 to match CZ definitions.
Signed-off-by: Oded Gabbay <oded.gabbay@gmail.com>
Diffstat (limited to 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 3 | ||||
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_kfd.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/include/kgd_kfd_interface.h b/drivers/gpu/drm/amd/include/kgd_kfd_interface.h index 9080daa116b6..888250b33ea8 100644 --- a/drivers/gpu/drm/amd/include/kgd_kfd_interface.h +++ b/drivers/gpu/drm/amd/include/kgd_kfd_interface.h | |||
| @@ -52,7 +52,8 @@ enum kgd_engine_type { | |||
| 52 | KGD_ENGINE_MEC1, | 52 | KGD_ENGINE_MEC1, |
| 53 | KGD_ENGINE_MEC2, | 53 | KGD_ENGINE_MEC2, |
| 54 | KGD_ENGINE_RLC, | 54 | KGD_ENGINE_RLC, |
| 55 | KGD_ENGINE_SDMA, | 55 | KGD_ENGINE_SDMA1, |
| 56 | KGD_ENGINE_SDMA2, | ||
| 56 | KGD_ENGINE_MAX | 57 | KGD_ENGINE_MAX |
| 57 | }; | 58 | }; |
| 58 | 59 | ||
diff --git a/drivers/gpu/drm/radeon/radeon_kfd.c b/drivers/gpu/drm/radeon/radeon_kfd.c index e476c331f3fa..9a4d69e59401 100644 --- a/drivers/gpu/drm/radeon/radeon_kfd.c +++ b/drivers/gpu/drm/radeon/radeon_kfd.c | |||
| @@ -845,7 +845,8 @@ static uint16_t get_fw_version(struct kgd_dev *kgd, enum kgd_engine_type type) | |||
| 845 | hdr = (const union radeon_firmware_header *) rdev->rlc_fw->data; | 845 | hdr = (const union radeon_firmware_header *) rdev->rlc_fw->data; |
| 846 | break; | 846 | break; |
| 847 | 847 | ||
| 848 | case KGD_ENGINE_SDMA: | 848 | case KGD_ENGINE_SDMA1: |
| 849 | case KGD_ENGINE_SDMA2: | ||
| 849 | hdr = (const union radeon_firmware_header *) | 850 | hdr = (const union radeon_firmware_header *) |
| 850 | rdev->sdma_fw->data; | 851 | rdev->sdma_fw->data; |
| 851 | break; | 852 | break; |
