Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8fe58ce authored by Maruthi Bayyavarapu's avatar Maruthi Bayyavarapu Committed by Alex Deucher
Browse files

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: default avatarJammy Zhou <Jammy.Zhou@amd.com>
Reviewed-by: default avatarMaruthi Bayyavarapu <maruthi.bayyavarapu@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarMurali Krishna Vemuri <murali-krishna.vemuri@amd.com>
Signed-off-by: default avatarMaruthi Bayyavarapu <maruthi.bayyavarapu@amd.com>
Signed-off-by: default avatarChunming Zhou <david1.zhou@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 4ebd1673

drivers/gpu/drm/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -162,6 +162,8 @@ config DRM_AMDGPU 
source "drivers/gpu/drm/amd/amdgpu/Kconfig"

source "drivers/gpu/drm/amd/powerplay/Kconfig"



source "drivers/gpu/drm/amd/acp/Kconfig"



source "drivers/gpu/drm/nouveau/Kconfig"



config DRM_I810

drivers/gpu/drm/amd/acp/Kconfig

0 → 100644
+10 −0
Original line number Diff line number Diff line 
menu "ACP Configuration"



config DRM_AMD_ACP

       bool "Enable ACP IP support"

       default y

       select MFD_CORE

       help

	Choose this option to enable ACP IP support for AMD SOCs.



endmenu

drivers/gpu/drm/amd/acp/Makefile

0 → 100644
+8 −0
Original line number Diff line number Diff line 
#

# Makefile for the ACP, which is a sub-component

# of AMDSOC/AMDGPU drm driver.

# It provides the HW control for ACP related functionalities.



subdir-ccflags-y += -I$(AMDACPPATH)/ -I$(AMDACPPATH)/include



AMD_ACP_FILES := $(AMDACPPATH)/acp_hw.o

drivers/gpu/drm/amd/acp/acp_hw.c

0 → 100644
+50 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2015 Advanced Micro Devices, Inc.

 *

 * Permission is hereby granted, free of charge, to any person obtaining a

 * copy of this software and associated documentation files (the "Software"),

 * to deal in the Software without restriction, including without limitation

 * the rights to use, copy, modify, merge, publish, distribute, sublicense,

 * and/or sell copies of the Software, and to permit persons to whom the

 * Software is furnished to do so, subject to the following conditions:

 *

 * The above copyright notice and this permission notice shall be included in

 * all copies or substantial portions of the Software.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

 * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

 * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

 * OTHER DEALINGS IN THE SOFTWARE.

 *

 */



#include <linux/mm.h>

#include <linux/slab.h>

#include <linux/device.h>

#include <linux/delay.h>

#include <linux/errno.h>



#include "acp_gfx_if.h"



#define ACP_MODE_I2S	0

#define ACP_MODE_AZ	1



#define mmACP_AZALIA_I2S_SELECT 0x51d4



int amd_acp_hw_init(void *cgs_device,

		    unsigned acp_version_major, unsigned acp_version_minor)

{

	unsigned int acp_mode = ACP_MODE_I2S;



	if ((acp_version_major == 2) && (acp_version_minor == 2))

		acp_mode = cgs_read_register(cgs_device,

					mmACP_AZALIA_I2S_SELECT);



	if (acp_mode != ACP_MODE_I2S)

		return -ENODEV;



	return 0;

}

drivers/gpu/drm/amd/acp/include/acp_gfx_if.h

0 → 100644
+34 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2015 Advanced Micro Devices, Inc.

 *

 * Permission is hereby granted, free of charge, to any person obtaining a

 * copy of this software and associated documentation files (the "Software"),

 * to deal in the Software without restriction, including without limitation

 * the rights to use, copy, modify, merge, publish, distribute, sublicense,

 * and/or sell copies of the Software, and to permit persons to whom the

 * Software is furnished to do so, subject to the following conditions:

 *

 * The above copyright notice and this permission notice shall be included in

 * all copies or substantial portions of the Software.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

 * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

 * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

 * OTHER DEALINGS IN THE SOFTWARE.

 *

*/



#ifndef _ACP_GFX_IF_H

#define _ACP_GFX_IF_H



#include <linux/types.h>

#include "cgs_linux.h"

#include "cgs_common.h"



int amd_acp_hw_init(void *cgs_device,

		    unsigned acp_version_major, unsigned acp_version_minor);



#endif /* _ACP_GFX_IF_H */