diff options
| author | Lijo Lazar <lijo.lazar@amd.com> | 2023-02-17 18:44:20 +0530 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2023-06-09 09:56:03 -0400 |
| commit | 07bc0ac8ff49c9868a66526634fbc21cb194afca (patch) | |
| tree | 90402591be12edb2632e9ded52a280291cfea047 /drivers/gpu | |
| parent | drm/amdgpu: Add instance mask for VCN and JPEG (diff) | |
| download | linux-07bc0ac8ff49c9868a66526634fbc21cb194afca.tar.gz linux-07bc0ac8ff49c9868a66526634fbc21cb194afca.zip | |
drm/amdgpu: Add VCN logical to physical id mapping
Add mappings for logical to physical id for VCN/JPEG 4.0.3
v2: make local function static (Alex)
Signed-off-by: Lijo Lazar <lijo.lazar@amd.com>
Acked-by: Leo Liu <leo.liu@amd.com>
Tested-by: James Zhu <James.Zhu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/aqua_vanjaram_reg_init.c | 18 |
1 files changed, 18 insertions, 0 deletions
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 fdc728f678d7..90fe77db9bee 100644 --- a/drivers/gpu/drm/amd/amdgpu/aqua_vanjaram_reg_init.c +++ b/drivers/gpu/drm/amd/amdgpu/aqua_vanjaram_reg_init.c @@ -82,6 +82,21 @@ static int8_t aqua_vanjaram_logical_to_dev_inst(struct amdgpu_device *adev, return dev_inst; } +static void aqua_vanjaram_populate_ip_map(struct amdgpu_device *adev, + enum amd_hw_ip_block_type ip_block, + uint32_t inst_mask) +{ + int l = 0, i; + + while (inst_mask) { + i = ffs(inst_mask) - 1; + adev->ip_map.dev_inst[ip_block][l++] = i; + inst_mask &= ~(1 << i); + } + for (; l < HWIP_MAX_INSTANCE; l++) + adev->ip_map.dev_inst[ip_block][l] = -1; +} + void aqua_vanjaram_ip_map_init(struct amdgpu_device *adev) { int xcc_mask, sdma_mask; @@ -108,6 +123,9 @@ void aqua_vanjaram_ip_map_init(struct amdgpu_device *adev) for (; l < HWIP_MAX_INSTANCE; l++) adev->ip_map.dev_inst[SDMA0_HWIP][l] = -1; + /* This covers both VCN and JPEG, JPEG is only alias of VCN */ + aqua_vanjaram_populate_ip_map(adev, VCN_HWIP, adev->vcn.inst_mask); + adev->ip_map.logical_to_dev_inst = aqua_vanjaram_logical_to_dev_inst; } |