diff options
| author | Maruthi Bayyavarapu <[email protected]> | 2015-09-22 21:05:20 +0000 |
|---|---|---|
| committer | Alex Deucher <[email protected]> | 2016-02-10 19:17:08 +0000 |
| commit | a8fe58cec351c25e09c393bf46117c0c47b5a17c (patch) | |
| tree | 5f3b90b947be6445bb2c73f8ea300bae64c8e0ac /drivers/gpu/drm/amd/amdgpu/vi.c | |
| parent | drm/amdgpu: remove power of two limit for vramlimit (diff) | |
| download | kernel-a8fe58cec351c25e09c393bf46117c0c47b5a17c.tar.gz kernel-a8fe58cec351c25e09c393bf46117c0c47b5a17c.zip | |
drm/amd: add ACP driver support
This adds the ACP (Audio CoProcessor) IP driver and wires
it up to the amdgpu driver. The ACP block provides the DMA
engine for i2s based ALSA driver. This is required for audio
on APUs that utilize an i2s codec.
Reviewed-by: Jammy Zhou <[email protected]>
Reviewed-by: Maruthi Bayyavarapu <[email protected]>
Reviewed-by: Alex Deucher <[email protected]>
Reviewed-by: Murali Krishna Vemuri <[email protected]>
Signed-off-by: Maruthi Bayyavarapu <[email protected]>
Signed-off-by: Chunming Zhou <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/vi.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/vi.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/vi.c b/drivers/gpu/drm/amd/amdgpu/vi.c index 09a25a413db7..125003517544 100644 --- a/drivers/gpu/drm/amd/amdgpu/vi.c +++ b/drivers/gpu/drm/amd/amdgpu/vi.c @@ -74,6 +74,9 @@ #include "uvd_v6_0.h" #include "vce_v3_0.h" #include "amdgpu_powerplay.h" +#if defined(CONFIG_DRM_AMD_ACP) +#include "amdgpu_acp.h" +#endif /* * Indirect registers accessor @@ -970,6 +973,15 @@ static const struct amdgpu_ip_block_version cz_ip_blocks[] = .rev = 0, .funcs = &vce_v3_0_ip_funcs, }, +#if defined(CONFIG_DRM_AMD_ACP) + { + .type = AMD_IP_BLOCK_TYPE_ACP, + .major = 2, + .minor = 2, + .rev = 0, + .funcs = &acp_ip_funcs, + }, +#endif }; int vi_set_ip_blocks(struct amdgpu_device *adev) |