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

Commit 04d5e276 authored by Amber Lin's avatar Amber Lin Committed by Alex Deucher
Browse files

drm/amdgpu: Merge amdkfd into amdgpu 



Since KFD is only supported by single GPU driver, it makes sense to merge
amdgpu and amdkfd into one module. This patch is the initial step: merge
Kconfig and Makefile.

v2: also remove kfd from drm Kconfig

Signed-off-by: default avatarAmber Lin <Amber.Lin@amd.com>
Acked-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarFelix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 7d0aa376

drivers/gpu/drm/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -285,8 +285,6 @@ source "drivers/gpu/drm/bridge/Kconfig" 


source "drivers/gpu/drm/sti/Kconfig"



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



source "drivers/gpu/drm/imx/Kconfig"



source "drivers/gpu/drm/v3d/Kconfig"

drivers/gpu/drm/amd/amdgpu/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -42,3 +42,4 @@ config DRM_AMDGPU_GART_DEBUGFS 


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

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

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

drivers/gpu/drm/amd/amdgpu/Makefile

+5 −1
Original line number Diff line number Diff line
@@ -35,7 +35,8 @@ ccflags-y := -I$(FULL_AMD_PATH)/include/asic_reg \ 
	-I$(FULL_AMD_DISPLAY_PATH) \

	-I$(FULL_AMD_DISPLAY_PATH)/include \

	-I$(FULL_AMD_DISPLAY_PATH)/dc \

	-I$(FULL_AMD_DISPLAY_PATH)/amdgpu_dm

	-I$(FULL_AMD_DISPLAY_PATH)/amdgpu_dm \

	-I$(FULL_AMD_PATH)/amdkfd



amdgpu-y := amdgpu_drv.o
@@ -136,6 +137,9 @@ amdgpu-y += \ 
amdgpu-y += amdgpu_amdkfd.o



ifneq ($(CONFIG_HSA_AMD),)

AMDKFD_PATH := ../amdkfd

include $(FULL_AMD_PATH)/amdkfd/Makefile

amdgpu-y += $(AMDKFD_FILES)

amdgpu-y += \

	 amdgpu_amdkfd_fence.o \

	 amdgpu_amdkfd_gpuvm.o \

drivers/gpu/drm/amd/amdkfd/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
#



config HSA_AMD

	tristate "HSA kernel driver for AMD GPU devices"

	bool "HSA kernel driver for AMD GPU devices"

	depends on DRM_AMDGPU && X86_64

	imply AMD_IOMMU_V2

	select MMU_NOTIFIER

drivers/gpu/drm/amd/amdkfd/Makefile

+34 −19
Original line number Diff line number Diff line
@@ -23,26 +23,41 @@ 
# Makefile for Heterogenous System Architecture support for AMD GPU devices

#



ccflags-y := -Idrivers/gpu/drm/amd/include/  \

		-Idrivers/gpu/drm/amd/include/asic_reg



amdkfd-y	:= kfd_module.o kfd_device.o kfd_chardev.o kfd_topology.o \

		kfd_pasid.o kfd_doorbell.o kfd_flat_memory.o \

		kfd_process.o kfd_queue.o kfd_mqd_manager.o \

		kfd_mqd_manager_cik.o kfd_mqd_manager_vi.o \

		kfd_mqd_manager_v9.o \

		kfd_kernel_queue.o kfd_kernel_queue_cik.o \

		kfd_kernel_queue_vi.o kfd_kernel_queue_v9.o \

		kfd_packet_manager.o kfd_process_queue_manager.o \

		kfd_device_queue_manager.o kfd_device_queue_manager_cik.o \

		kfd_device_queue_manager_vi.o kfd_device_queue_manager_v9.o \

		kfd_interrupt.o kfd_events.o cik_event_interrupt.o \

		kfd_int_process_v9.o kfd_dbgdev.o kfd_dbgmgr.o kfd_crat.o

AMDKFD_FILES	:= $(AMDKFD_PATH)/kfd_module.o \

		$(AMDKFD_PATH)/kfd_device.o \

		$(AMDKFD_PATH)/kfd_chardev.o \

		$(AMDKFD_PATH)/kfd_topology.o \

		$(AMDKFD_PATH)/kfd_pasid.o \

		$(AMDKFD_PATH)/kfd_doorbell.o \

		$(AMDKFD_PATH)/kfd_flat_memory.o \

		$(AMDKFD_PATH)/kfd_process.o \

		$(AMDKFD_PATH)/kfd_queue.o \

		$(AMDKFD_PATH)/kfd_mqd_manager.o \

		$(AMDKFD_PATH)/kfd_mqd_manager_cik.o \

		$(AMDKFD_PATH)/kfd_mqd_manager_vi.o \

		$(AMDKFD_PATH)/kfd_mqd_manager_v9.o \

		$(AMDKFD_PATH)/kfd_kernel_queue.o \

		$(AMDKFD_PATH)/kfd_kernel_queue_cik.o \

		$(AMDKFD_PATH)/kfd_kernel_queue_vi.o \

		$(AMDKFD_PATH)/kfd_kernel_queue_v9.o \

		$(AMDKFD_PATH)/kfd_packet_manager.o \

		$(AMDKFD_PATH)/kfd_process_queue_manager.o \

		$(AMDKFD_PATH)/kfd_device_queue_manager.o \

		$(AMDKFD_PATH)/kfd_device_queue_manager_cik.o \

		$(AMDKFD_PATH)/kfd_device_queue_manager_vi.o \

		$(AMDKFD_PATH)/kfd_device_queue_manager_v9.o \

		$(AMDKFD_PATH)/kfd_interrupt.o \

		$(AMDKFD_PATH)/kfd_events.o \

		$(AMDKFD_PATH)/cik_event_interrupt.o \

		$(AMDKFD_PATH)/kfd_int_process_v9.o \

		$(AMDKFD_PATH)/kfd_dbgdev.o \

		$(AMDKFD_PATH)/kfd_dbgmgr.o \

		$(AMDKFD_PATH)/kfd_crat.o



ifneq ($(CONFIG_AMD_IOMMU_V2),)

amdkfd-y += kfd_iommu.o

AMDKFD_FILES += $(AMDKFD_PATH)/kfd_iommu.o

endif



amdkfd-$(CONFIG_DEBUG_FS) += kfd_debugfs.o



obj-$(CONFIG_HSA_AMD)	+= amdkfd.o
 
ifneq ($(CONFIG_DEBUG_FS),)

AMDKFD_FILES += $(AMDKFD_PATH)/kfd_debugfs.o

endif