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

Commit f4fa88ab authored by Christian König's avatar Christian König Committed by Oded Gabbay
Browse files

drm/radeon: deprecate and remove KFD interface 



To quote Felix: "For testing KV with current user mode stack, please use
amdgpu. I don't expect this to work with radeon and I'm not planning to
spend any effort on making radeon work with a current user mode stack."

Only compile tested, but should be straight forward.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarOded Gabbay <oded.gabbay@gmail.com>
parent 48e876a2

MAINTAINERS

+0 −2
Original line number Diff line number Diff line
@@ -759,8 +759,6 @@ F: drivers/gpu/drm/amd/amdkfd/ 
F:	drivers/gpu/drm/amd/include/cik_structs.h

F:	drivers/gpu/drm/amd/include/kgd_kfd_interface.h

F:	drivers/gpu/drm/amd/include/vi_structs.h

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

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

F:	include/uapi/linux/kfd_ioctl.h



AMD SEATTLE DEVICE TREE SUPPORT

drivers/gpu/drm/amd/amdkfd/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -4,6 +4,6 @@ 


config HSA_AMD

	tristate "HSA kernel driver for AMD GPU devices"

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

	depends on DRM_AMDGPU && AMD_IOMMU_V2 && X86_64

	help

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

drivers/gpu/drm/radeon/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -102,8 +102,7 @@ radeon-y += \ 
radeon-y += \

	radeon_vce.o \

	vce_v1_0.o \

	vce_v2_0.o \

	radeon_kfd.o

	vce_v2_0.o



radeon-$(CONFIG_VGA_SWITCHEROO) += radeon_atpx_handler.o

radeon-$(CONFIG_ACPI) += radeon_acpi.o

drivers/gpu/drm/radeon/cik.c

+2 −12
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 
#include "cik_blit_shaders.h"

#include "radeon_ucode.h"

#include "clearstate_ci.h"

#include "radeon_kfd.h"



#define SH_MEM_CONFIG_GFX_DEFAULT \

	ALIGNMENT_MODE(SH_MEM_ALIGNMENT_MODE_UNALIGNED)
@@ -5684,10 +5683,9 @@ int cik_vm_init(struct radeon_device *rdev) 
	/*

	 * number of VMs

	 * VMID 0 is reserved for System

	 * radeon graphics/compute will use VMIDs 1-7

	 * amdkfd will use VMIDs 8-15

	 * radeon graphics/compute will use VMIDs 1-15

	 */

	rdev->vm_manager.nvm = RADEON_NUM_OF_VMIDS;

	rdev->vm_manager.nvm = 16;

	/* base offset of vram pages */

	if (rdev->flags & RADEON_IS_IGP) {

		u64 tmp = RREG32(MC_VM_FB_OFFSET);
@@ -7589,9 +7587,6 @@ int cik_irq_process(struct radeon_device *rdev) 
		/* wptr/rptr are in bytes! */

		ring_index = rptr / 4;



		radeon_kfd_interrupt(rdev,

				(const void *) &rdev->ih.ring[ring_index]);



		src_id =  le32_to_cpu(rdev->ih.ring[ring_index]) & 0xff;

		src_data = le32_to_cpu(rdev->ih.ring[ring_index + 1]) & 0xfffffff;

		ring_id = le32_to_cpu(rdev->ih.ring[ring_index + 2]) & 0xff;
@@ -8486,10 +8481,6 @@ static int cik_startup(struct radeon_device *rdev) 
	if (r)

		return r;



	r = radeon_kfd_resume(rdev);

	if (r)

		return r;



	return 0;

}
@@ -8538,7 +8529,6 @@ int cik_resume(struct radeon_device *rdev) 
 */

int cik_suspend(struct radeon_device *rdev)

{

	radeon_kfd_suspend(rdev);

	radeon_pm_suspend(rdev);

	radeon_audio_fini(rdev);

	radeon_vm_manager_fini(rdev);

drivers/gpu/drm/radeon/cikd.h

+0 −2
Original line number Diff line number Diff line
@@ -30,8 +30,6 @@ 
#define CIK_RB_BITMAP_WIDTH_PER_SH     2

#define HAWAII_RB_BITMAP_WIDTH_PER_SH  4



#define RADEON_NUM_OF_VMIDS	8



/* DIDT IND registers */

#define DIDT_SQ_CTRL0                                     0x0

#       define DIDT_CTRL_EN                               (1 << 0)