Commit 1b491330 authored by Likun Gao's avatar Likun Gao Committed by Alex Deucher
Browse files

drm/amdgpu: add lsdma block 



Add Light SDMA (LSDMA) block and related function. LSDMA
is a small instance of SDMA mainly for kernel driver use.

Signed-off-by: default avatarLikun Gao <Likun.Gao@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 81570d6d

drivers/gpu/drm/amd/amdgpu/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ amdgpu-y += amdgpu_device.o amdgpu_kms.o \ 
	amdgpu_vm_sdma.o amdgpu_discovery.o amdgpu_ras_eeprom.o amdgpu_nbio.o \

	amdgpu_umc.o smu_v11_0_i2c.o amdgpu_fru_eeprom.o amdgpu_rap.o \

	amdgpu_fw_attestation.o amdgpu_securedisplay.o \

	amdgpu_eeprom.o amdgpu_mca.o amdgpu_psp_ta.o

	amdgpu_eeprom.o amdgpu_mca.o amdgpu_psp_ta.o amdgpu_lsdma.o



amdgpu-$(CONFIG_PROC_FS) += amdgpu_fdinfo.o
@@ -75,7 +75,7 @@ amdgpu-y += \ 
	vi.o mxgpu_vi.o nbio_v6_1.o soc15.o emu_soc.o mxgpu_ai.o nbio_v7_0.o vega10_reg_init.o \

	vega20_reg_init.o nbio_v7_4.o nbio_v2_3.o nv.o arct_reg_init.o mxgpu_nv.o \

	nbio_v7_2.o hdp_v4_0.o hdp_v5_0.o aldebaran_reg_init.o aldebaran.o soc21.o \

	nbio_v4_3.o hdp_v6_0.o nbio_v7_7.o hdp_v5_2.o

	nbio_v4_3.o hdp_v6_0.o nbio_v7_7.o hdp_v5_2.o lsdma_v6_0.o



# add DF block

amdgpu-y += \

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+5 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ 
#include "amdgpu_gmc.h"

#include "amdgpu_gfx.h"

#include "amdgpu_sdma.h"

#include "amdgpu_lsdma.h"

#include "amdgpu_nbio.h"

#include "amdgpu_hdp.h"

#include "amdgpu_dm.h"
@@ -643,6 +644,7 @@ enum amd_hw_ip_block_type { 
	SDMA5_HWIP,

	SDMA6_HWIP,

	SDMA7_HWIP,

	LSDMA_HWIP,

	MMHUB_HWIP,

	ATHUB_HWIP,

	NBIO_HWIP,
@@ -909,6 +911,9 @@ struct amdgpu_device { 
	/* sdma */

	struct amdgpu_sdma		sdma;



	/* lsdma */

	struct amdgpu_lsdma		lsdma;



	/* uvd */

	struct amdgpu_uvd		uvd;

drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c

+3 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ 
#include "sdma_v5_0.h"

#include "sdma_v5_2.h"

#include "sdma_v6_0.h"

#include "lsdma_v6_0.h"

#include "vcn_v2_0.h"

#include "jpeg_v2_0.h"

#include "vcn_v3_0.h"
@@ -124,6 +125,7 @@ static const char *hw_id_names[HW_ID_MAX] = { 
	[SDMA1_HWID]		= "SDMA1",

	[SDMA2_HWID]		= "SDMA2",

	[SDMA3_HWID]		= "SDMA3",

	[LSDMA_HWID]		= "LSDMA",

	[ISP_HWID]		= "ISP",

	[DBGU_IO_HWID]		= "DBGU_IO",

	[DF_HWID]		= "DF",
@@ -173,6 +175,7 @@ static int hw_id_map[MAX_HWIP] = { 
	[SDMA1_HWIP]	= SDMA1_HWID,

	[SDMA2_HWIP]    = SDMA2_HWID,

	[SDMA3_HWIP]    = SDMA3_HWID,

	[LSDMA_HWIP]    = LSDMA_HWID,

	[MMHUB_HWIP]	= MMHUB_HWID,

	[ATHUB_HWIP]	= ATHUB_HWID,

	[NBIO_HWIP]	= NBIF_HWID,

drivers/gpu/drm/amd/amdgpu/amdgpu_lsdma.c

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

 * Copyright 2022 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 "amdgpu.h"

#include "amdgpu_lsdma.h"

drivers/gpu/drm/amd/amdgpu/amdgpu_lsdma.h

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

 * Copyright 2022 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 __AMDGPU_LSDMA_H__

#define __AMDGPU_LSDMA_H__



struct amdgpu_lsdma {

	const struct amdgpu_lsdma_funcs      *funcs;

};



struct amdgpu_lsdma_funcs {

};



#endif