drm/amdgpu: remove unused and mostly unimplemented CGS functions v2

Those functions are all unused and some not even implemented.

v2: keep cgs_get_pci_resource, it is used by the ACP driver.

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

1 files changed, 0 insertions, 198 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
index 013f5f14dd75..c6dba1eaefbd 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
@@ -42,82 +42,6 @@ struct amdgpu_cgs_device {
         struct amdgpu_device *adev =                                    \
                 ((struct amdgpu_cgs_device *)cgs_device)->adev
 
-static int amdgpu_cgs_gpu_mem_info(struct cgs_device *cgs_device, enum cgs_gpu_mem_type type,
-                                   uint64_t *mc_start, uint64_t *mc_size,
-                                   uint64_t *mem_size)
-{
-        CGS_FUNC_ADEV;
-        switch(type) {
-        case CGS_GPU_MEM_TYPE__VISIBLE_CONTIG_FB:
-        case CGS_GPU_MEM_TYPE__VISIBLE_FB:
-                *mc_start = 0;
-                *mc_size = adev->mc.visible_vram_size;
-                *mem_size = adev->mc.visible_vram_size - adev->vram_pin_size;
-                break;
-        case CGS_GPU_MEM_TYPE__INVISIBLE_CONTIG_FB:
-        case CGS_GPU_MEM_TYPE__INVISIBLE_FB:
-                *mc_start = adev->mc.visible_vram_size;
-                *mc_size = adev->mc.real_vram_size - adev->mc.visible_vram_size;
-                *mem_size = *mc_size;
-                break;
-        case CGS_GPU_MEM_TYPE__GART_CACHEABLE:
-        case CGS_GPU_MEM_TYPE__GART_WRITECOMBINE:
-                *mc_start = adev->mc.gtt_start;
-                *mc_size = adev->mc.gtt_size;
-                *mem_size = adev->mc.gtt_size - adev->gart_pin_size;
-                break;
-        default:
-                return -EINVAL;
-        }
-
-        return 0;
-}
-
-static int amdgpu_cgs_gmap_kmem(struct cgs_device *cgs_device, void *kmem,
-                                uint64_t size,
-                                uint64_t min_offset, uint64_t max_offset,
-                                cgs_handle_t *kmem_handle, uint64_t *mcaddr)
-{
-        CGS_FUNC_ADEV;
-        int ret;
-        struct amdgpu_bo *bo;
-        struct page *kmem_page = vmalloc_to_page(kmem);
-        int npages = ALIGN(size, PAGE_SIZE) >> PAGE_SHIFT;
-
-        struct sg_table *sg = drm_prime_pages_to_sg(&kmem_page, npages);
-        ret = amdgpu_bo_create(adev, size, PAGE_SIZE, false,
-                               AMDGPU_GEM_DOMAIN_GTT, 0, sg, NULL, &bo);
-        if (ret)
-                return ret;
-        ret = amdgpu_bo_reserve(bo, true);
-        if (unlikely(ret != 0))
-                return ret;
-
-        /* pin buffer into GTT */
-        ret = amdgpu_bo_pin_restricted(bo, AMDGPU_GEM_DOMAIN_GTT,
-                                       min_offset, max_offset, mcaddr);
-        amdgpu_bo_unreserve(bo);
-
-        *kmem_handle = (cgs_handle_t)bo;
-        return ret;
-}
-
-static int amdgpu_cgs_gunmap_kmem(struct cgs_device *cgs_device, cgs_handle_t kmem_handle)
-{
-        struct amdgpu_bo *obj = (struct amdgpu_bo *)kmem_handle;
-
-        if (obj) {
-                int r = amdgpu_bo_reserve(obj, true);
-                if (likely(r == 0)) {
-                        amdgpu_bo_unpin(obj);
-                        amdgpu_bo_unreserve(obj);
-                }
-                amdgpu_bo_unref(&obj);
-
-        }
-        return 0;
-}
-
 static int amdgpu_cgs_alloc_gpu_mem(struct cgs_device *cgs_device,
                                     enum cgs_gpu_mem_type type,
                                     uint64_t size, uint64_t align,
@@ -349,62 +273,6 @@ static void amdgpu_cgs_write_ind_register(struct cgs_device *cgs_device,
         WARN(1, "Invalid indirect register space");
 }
 
-static uint8_t amdgpu_cgs_read_pci_config_byte(struct cgs_device *cgs_device, unsigned addr)
-{
-        CGS_FUNC_ADEV;
-        uint8_t val;
-        int ret = pci_read_config_byte(adev->pdev, addr, &val);
-        if (WARN(ret, "pci_read_config_byte error"))
-                return 0;
-        return val;
-}
-
-static uint16_t amdgpu_cgs_read_pci_config_word(struct cgs_device *cgs_device, unsigned addr)
-{
-        CGS_FUNC_ADEV;
-        uint16_t val;
-        int ret = pci_read_config_word(adev->pdev, addr, &val);
-        if (WARN(ret, "pci_read_config_word error"))
-                return 0;
-        return val;
-}
-
-static uint32_t amdgpu_cgs_read_pci_config_dword(struct cgs_device *cgs_device,
-                                                 unsigned addr)
-{
-        CGS_FUNC_ADEV;
-        uint32_t val;
-        int ret = pci_read_config_dword(adev->pdev, addr, &val);
-        if (WARN(ret, "pci_read_config_dword error"))
-                return 0;
-        return val;
-}
-
-static void amdgpu_cgs_write_pci_config_byte(struct cgs_device *cgs_device, unsigned addr,
-                                             uint8_t value)
-{
-        CGS_FUNC_ADEV;
-        int ret = pci_write_config_byte(adev->pdev, addr, value);
-        WARN(ret, "pci_write_config_byte error");
-}
-
-static void amdgpu_cgs_write_pci_config_word(struct cgs_device *cgs_device, unsigned addr,
-                                             uint16_t value)
-{
-        CGS_FUNC_ADEV;
-        int ret = pci_write_config_word(adev->pdev, addr, value);
-        WARN(ret, "pci_write_config_word error");
-}
-
-static void amdgpu_cgs_write_pci_config_dword(struct cgs_device *cgs_device, unsigned addr,
-                                              uint32_t value)
-{
-        CGS_FUNC_ADEV;
-        int ret = pci_write_config_dword(adev->pdev, addr, value);
-        WARN(ret, "pci_write_config_dword error");
-}
-
-
 static int amdgpu_cgs_get_pci_resource(struct cgs_device *cgs_device,
                                        enum cgs_resource_type resource_type,
                                        uint64_t size,
@@ -477,56 +345,6 @@ static int amdgpu_cgs_atom_exec_cmd_table(struct cgs_device *cgs_device, unsigne
                 adev->mode_info.atom_context, table, args);
 }
 
-static int amdgpu_cgs_create_pm_request(struct cgs_device *cgs_device, cgs_handle_t *request)
-{
-        /* TODO */
-        return 0;
-}
-
-static int amdgpu_cgs_destroy_pm_request(struct cgs_device *cgs_device, cgs_handle_t request)
-{
-        /* TODO */
-        return 0;
-}
-
-static int amdgpu_cgs_set_pm_request(struct cgs_device *cgs_device, cgs_handle_t request,
-                                     int active)
-{
-        /* TODO */
-        return 0;
-}
-
-static int amdgpu_cgs_pm_request_clock(struct cgs_device *cgs_device, cgs_handle_t request,
-                                       enum cgs_clock clock, unsigned freq)
-{
-        /* TODO */
-        return 0;
-}
-
-static int amdgpu_cgs_pm_request_engine(struct cgs_device *cgs_device, cgs_handle_t request,
-                                        enum cgs_engine engine, int powered)
-{
-        /* TODO */
-        return 0;
-}
-
-
-
-static int amdgpu_cgs_pm_query_clock_limits(struct cgs_device *cgs_device,
-                                            enum cgs_clock clock,
-                                            struct cgs_clock_limits *limits)
-{
-        /* TODO */
-        return 0;
-}
-
-static int amdgpu_cgs_set_camera_voltages(struct cgs_device *cgs_device, uint32_t mask,
-                                          const uint32_t *voltages)
-{
-        DRM_ERROR("not implemented");
-        return -EPERM;
-}
-
 struct cgs_irq_params {
         unsigned src_id;
         cgs_irq_source_set_func_t set;
@@ -1269,9 +1087,6 @@ static int amdgpu_cgs_call_acpi_method(struct cgs_device *cgs_device,
 }
 
 static const struct cgs_ops amdgpu_cgs_ops = {
-        .gpu_mem_info = amdgpu_cgs_gpu_mem_info,
-        .gmap_kmem = amdgpu_cgs_gmap_kmem,
-        .gunmap_kmem = amdgpu_cgs_gunmap_kmem,
         .alloc_gpu_mem = amdgpu_cgs_alloc_gpu_mem,
         .free_gpu_mem = amdgpu_cgs_free_gpu_mem,
         .gmap_gpu_mem = amdgpu_cgs_gmap_gpu_mem,
@@ -1282,23 +1097,10 @@ static const struct cgs_ops amdgpu_cgs_ops = {
         .write_register = amdgpu_cgs_write_register,
         .read_ind_register = amdgpu_cgs_read_ind_register,
         .write_ind_register = amdgpu_cgs_write_ind_register,
-        .read_pci_config_byte = amdgpu_cgs_read_pci_config_byte,
-        .read_pci_config_word = amdgpu_cgs_read_pci_config_word,
-        .read_pci_config_dword = amdgpu_cgs_read_pci_config_dword,
-        .write_pci_config_byte = amdgpu_cgs_write_pci_config_byte,
-        .write_pci_config_word = amdgpu_cgs_write_pci_config_word,
-        .write_pci_config_dword = amdgpu_cgs_write_pci_config_dword,
         .get_pci_resource = amdgpu_cgs_get_pci_resource,
         .atom_get_data_table = amdgpu_cgs_atom_get_data_table,
         .atom_get_cmd_table_revs = amdgpu_cgs_atom_get_cmd_table_revs,
         .atom_exec_cmd_table = amdgpu_cgs_atom_exec_cmd_table,
-        .create_pm_request = amdgpu_cgs_create_pm_request,
-        .destroy_pm_request = amdgpu_cgs_destroy_pm_request,
-        .set_pm_request = amdgpu_cgs_set_pm_request,
-        .pm_request_clock = amdgpu_cgs_pm_request_clock,
-        .pm_request_engine = amdgpu_cgs_pm_request_engine,
-        .pm_query_clock_limits = amdgpu_cgs_pm_query_clock_limits,
-        .set_camera_voltages = amdgpu_cgs_set_camera_voltages,
         .get_firmware_info = amdgpu_cgs_get_firmware_info,
         .rel_firmware = amdgpu_cgs_rel_firmware,
         .set_powergating_state = amdgpu_cgs_set_powergating_state,