drm/amdgpu: Move generic logic to soc config

Move soc specific configuration details to aqua vanjaram specific file.

Signed-off-by: Lijo Lazar <lijo.lazar@amd.com>
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/aqua_vanjaram_reg_init.c b/drivers/gpu/drm/amd/amdgpu/aqua_vanjaram_reg_init.c
index 2cbac0b..a6204b5 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/aqua_vanjaram_reg_init.c
+++ b/drivers/gpu/drm/amd/amdgpu/aqua_vanjaram_reg_init.c
@@ -359,6 +359,15 @@ int aqua_vanjaram_init_soc_config(struct amdgpu_device *adev)
 {
        int ret;
 
+       /* generally 1 AID supports 4 instances */
+       adev->sdma.num_inst_per_aid = 4;
+       adev->sdma.num_instances = NUM_SDMA(adev->sdma.sdma_mask);
+
+       adev->vcn.num_inst_per_aid = 1;
+       adev->vcn.num_vcn_inst = adev->vcn.num_inst_per_aid * adev->num_aid;
+       adev->jpeg.num_inst_per_aid = 1;
+       adev->jpeg.num_jpeg_inst = adev->jpeg.num_inst_per_aid * adev->num_aid;
+
        ret = aqua_vanjaram_xcp_mgr_init(adev);
        if (ret)
                return ret;