From 8214ddae31f977c11c5379203f5ad0a038d389d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Date: Wed, 20 Dec 2017 10:45:36 +0100 Subject: [PATCH] Revert "drm/radeon: Report doorbell configuration to amdkfd" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit ebff8453d3a57a2405c4d96d9f9c4f4acc7d4d79. Unused since amdkfd is no longer supported with radeon. Reviewed-by: Christian König Signed-off-by: Michel Dänzer Signed-off-by: Alex Deucher --- drivers/gpu/drm/radeon/radeon.h | 4 ---- drivers/gpu/drm/radeon/radeon_device.c | 31 -------------------------- 2 files changed, 35 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h index b808c3bdcfd8..d34887873dea 100644 --- a/drivers/gpu/drm/radeon/radeon.h +++ b/drivers/gpu/drm/radeon/radeon.h @@ -731,10 +731,6 @@ struct radeon_doorbell { int radeon_doorbell_get(struct radeon_device *rdev, u32 *page); void radeon_doorbell_free(struct radeon_device *rdev, u32 doorbell); -void radeon_doorbell_get_kfd_info(struct radeon_device *rdev, - phys_addr_t *aperture_base, - size_t *aperture_size, - size_t *start_offset); /* * IRQS. diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c index e0b9fa4aaa9f..8d3e3d2e0090 100644 --- a/drivers/gpu/drm/radeon/radeon_device.c +++ b/drivers/gpu/drm/radeon/radeon_device.c @@ -392,37 +392,6 @@ void radeon_doorbell_free(struct radeon_device *rdev, u32 doorbell) __clear_bit(doorbell, rdev->doorbell.used); } -/** - * radeon_doorbell_get_kfd_info - Report doorbell configuration required to - * setup KFD - * - * @rdev: radeon_device pointer - * @aperture_base: output returning doorbell aperture base physical address - * @aperture_size: output returning doorbell aperture size in bytes - * @start_offset: output returning # of doorbell bytes reserved for radeon. - * - * Radeon and the KFD share the doorbell aperture. Radeon sets it up, - * takes doorbells required for its own rings and reports the setup to KFD. - * Radeon reserved doorbells are at the start of the doorbell aperture. - */ -void radeon_doorbell_get_kfd_info(struct radeon_device *rdev, - phys_addr_t *aperture_base, - size_t *aperture_size, - size_t *start_offset) -{ - /* The first num_doorbells are used by radeon. - * KFD takes whatever's left in the aperture. */ - if (rdev->doorbell.size > rdev->doorbell.num_doorbells * sizeof(u32)) { - *aperture_base = rdev->doorbell.base; - *aperture_size = rdev->doorbell.size; - *start_offset = rdev->doorbell.num_doorbells * sizeof(u32); - } else { - *aperture_base = 0; - *aperture_size = 0; - *start_offset = 0; - } -} - /* * radeon_wb_*() * Writeback is the the method by which the the GPU updates special pages -- GitLab