Commit cc5ac1ca authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'amdkfd-v6' of git://people.freedesktop.org/~gabbayo/linux into drm-next 

Merge AMDKFD it seems clean enough.
* 'amdkfd-v6' of git://people.freedesktop.org/~gabbayo/linux: (29 commits)
  amdkfd: Implement the Get Version IOCTL
  amdkfd: Implement the Get Process Aperture IOCTL
  amdkfd: Implement the Get Clock Counters IOCTL
  amdkfd: Implement the Set Memory Policy IOCTL
  amdkfd: Implement the create/destroy/update queue IOCTLs
  amdkfd: Add interrupt handling module
  amdkfd: Add device queue manager module
  amdkfd: Add process queue manager module
  amdkfd: Add packet manager module
  amdkfd: Add module parameter of scheduling policy
  amdkfd: Add kernel queue module
  amdkfd: Add mqd_manager module
  amdkfd: Add queue module
  amdkfd: Add binding/unbinding calls to amd_iommu driver
  amdkfd: Add basic modules to amdkfd
  amdkfd: Add topology module to amdkfd
  amdkfd: Add amdkfd skeleton driver
  amdkfd: Add IOCTL set definitions of amdkfd
  Update MAINTAINERS and CREDITS files with amdkfd info
  drm/radeon: Add radeon <--> amdkfd interface
  ...
parents 8975626e ecd5c982

CREDITS

+7 −0
Original line number Diff line number Diff line
@@ -1197,6 +1197,13 @@ S: R. Tocantins, 89 - Cristo Rei 
S: 80050-430 - Curitiba - Paraná

S: Brazil



N: Oded Gabbay

E: oded.gabbay@gmail.com

D: AMD KFD maintainer

S: 12 Shraga Raphaeli

S: Petah-Tikva, 4906418

S: Israel



N: Kumar Gala

E: galak@kernel.crashing.org

D: Embedded PowerPC 6xx/7xx/74xx/82xx/83xx/85xx support

MAINTAINERS

+10 −0
Original line number Diff line number Diff line
@@ -618,6 +618,16 @@ S: Maintained 
F:	drivers/iommu/amd_iommu*.[ch]

F:	include/linux/amd-iommu.h



AMD KFD

M:      Oded Gabbay <oded.gabbay@amd.com>

L:      dri-devel@lists.freedesktop.org

T:      git git://people.freedesktop.org/~gabbayo/linux.git

S:      Supported

F:      drivers/gpu/drm/amd/amdkfd/

F:      drivers/gpu/drm/radeon/radeon_kfd.c

F:      drivers/gpu/drm/radeon/radeon_kfd.h

F:      include/uapi/linux/kfd_ioctl.h



AMD MICROCODE UPDATE SUPPORT

M:	Andreas Herrmann <herrmann.der.user@googlemail.com>

L:	amd64-microcode@amd64.org

drivers/gpu/drm/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -200,3 +200,5 @@ source "drivers/gpu/drm/tegra/Kconfig" 
source "drivers/gpu/drm/panel/Kconfig"



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



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

drivers/gpu/drm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -65,3 +65,4 @@ obj-$(CONFIG_DRM_STI) += sti/ 
obj-y			+= i2c/

obj-y			+= panel/

obj-y			+= bridge/

obj-$(CONFIG_HSA_AMD) += amd/amdkfd/

drivers/gpu/drm/amd/amdkfd/Kconfig

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

# Heterogenous system architecture configuration

#



config HSA_AMD

	tristate "HSA kernel driver for AMD GPU devices"

	depends on (DRM_RADEON || DRM_AMDGPU) && AMD_IOMMU_V2 && X86_64

	help

	  Enable this if you want to use HSA features on AMD GPU devices.

CRA Git | Maintained and supported by SUSTech CRA and CCSE