]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
drm/amdgpu: add sdma support for renoir
authorHuang Rui <ray.huang@amd.com>
Thu, 8 Aug 2019 19:58:51 +0000 (14:58 -0500)
committerAlex Deucher <alexander.deucher@amd.com>
Mon, 12 Aug 2019 17:47:49 +0000 (12:47 -0500)
Add renoir checks to appropriate places.

Acked-by: Huang Rui <ray.huang@amd.com>
Signed-off-by: Huang Rui <ray.huang@amd.com>
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c

index 9fec80010861d3022358bb84ad93d2f1d98a88f2..b1340474ff12de95eb43cac0be788b146849c62f 100644 (file)
@@ -68,6 +68,7 @@ MODULE_FIRMWARE("amdgpu/raven_sdma.bin");
 MODULE_FIRMWARE("amdgpu/picasso_sdma.bin");
 MODULE_FIRMWARE("amdgpu/raven2_sdma.bin");
 MODULE_FIRMWARE("amdgpu/arcturus_sdma.bin");
+MODULE_FIRMWARE("amdgpu/renoir_sdma.bin");
 
 #define SDMA0_POWER_CNTL__ON_OFF_CONDITION_HOLD_TIME_MASK  0x000000F8L
 #define SDMA0_POWER_CNTL__ON_OFF_STATUS_DURATION_TIME_MASK 0xFC000000L
@@ -452,6 +453,9 @@ static int sdma_v4_0_init_microcode(struct amdgpu_device *adev)
        case CHIP_ARCTURUS:
                chip_name = "arcturus";
                break;
+       case CHIP_RENOIR:
+               chip_name = "renoir";
+               break;
        default:
                BUG();
        }
@@ -1640,7 +1644,7 @@ static int sdma_v4_0_early_init(void *handle)
        struct amdgpu_device *adev = (struct amdgpu_device *)handle;
        int r;
 
-       if (adev->asic_type == CHIP_RAVEN)
+       if (adev->asic_type == CHIP_RAVEN || adev->asic_type == CHIP_RENOIR)
                adev->sdma.num_instances = 1;
        else if (adev->asic_type == CHIP_ARCTURUS)
                adev->sdma.num_instances = 8;