drm/amdgpu: Remove wrapper layer of cgs irq handling

v2: add Vega12 support

1. remove struct cgs_os_ops
2. delete cgs_linux.h
3. refine the irq code for vega10, can fix set pp table
   failed issue.
4. add common smu irq process function

Acked-by: Christian König <christian.koenig@amd.com>
Acked-by: Junwei Zhang <Jerry.Zhang@amd.com>
Signed-off-by: Rex Zhu <Rex.Zhu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

1 files changed, 0 insertions, 111 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
index a8a0fd927da2..71a57b2f7f04 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
@@ -28,7 +28,6 @@
 #include <linux/firmware.h>
 #include <drm/amdgpu_drm.h>
 #include "amdgpu.h"
-#include "cgs_linux.h"
 #include "atom.h"
 #include "amdgpu_ucode.h"
 
@@ -182,109 +181,6 @@ static int amdgpu_cgs_atom_exec_cmd_table(struct cgs_device *cgs_device, unsigne
                 adev->mode_info.atom_context, table, args);
 }
 
-struct cgs_irq_params {
-        unsigned src_id;
-        cgs_irq_source_set_func_t set;
-        cgs_irq_handler_func_t handler;
-        void *private_data;
-};
-
-static int cgs_set_irq_state(struct amdgpu_device *adev,
-                             struct amdgpu_irq_src *src,
-                             unsigned type,
-                             enum amdgpu_interrupt_state state)
-{
-        struct cgs_irq_params *irq_params =
-                (struct cgs_irq_params *)src->data;
-        if (!irq_params)
-                return -EINVAL;
-        if (!irq_params->set)
-                return -EINVAL;
-        return irq_params->set(irq_params->private_data,
-                               irq_params->src_id,
-                               type,
-                               (int)state);
-}
-
-static int cgs_process_irq(struct amdgpu_device *adev,
-                           struct amdgpu_irq_src *source,
-                           struct amdgpu_iv_entry *entry)
-{
-        struct cgs_irq_params *irq_params =
-                (struct cgs_irq_params *)source->data;
-        if (!irq_params)
-                return -EINVAL;
-        if (!irq_params->handler)
-                return -EINVAL;
-        return irq_params->handler(irq_params->private_data,
-                                   irq_params->src_id,
-                                   entry->iv_entry);
-}
-
-static const struct amdgpu_irq_src_funcs cgs_irq_funcs = {
-        .set = cgs_set_irq_state,
-        .process = cgs_process_irq,
-};
-
-static int amdgpu_cgs_add_irq_source(void *cgs_device,
-                                     unsigned client_id,
-                                     unsigned src_id,
-                                     unsigned num_types,
-                                     cgs_irq_source_set_func_t set,
-                                     cgs_irq_handler_func_t handler,
-                                     void *private_data)
-{
-        CGS_FUNC_ADEV;
-        int ret = 0;
-        struct cgs_irq_params *irq_params;
-        struct amdgpu_irq_src *source =
-                kzalloc(sizeof(struct amdgpu_irq_src), GFP_KERNEL);
-        if (!source)
-                return -ENOMEM;
-        irq_params =
-                kzalloc(sizeof(struct cgs_irq_params), GFP_KERNEL);
-        if (!irq_params) {
-                kfree(source);
-                return -ENOMEM;
-        }
-        source->num_types = num_types;
-        source->funcs = &cgs_irq_funcs;
-        irq_params->src_id = src_id;
-        irq_params->set = set;
-        irq_params->handler = handler;
-        irq_params->private_data = private_data;
-        source->data = (void *)irq_params;
-        ret = amdgpu_irq_add_id(adev, client_id, src_id, source);
-        if (ret) {
-                kfree(irq_params);
-                kfree(source);
-        }
-
-        return ret;
-}
-
-static int amdgpu_cgs_irq_get(void *cgs_device, unsigned client_id,
-                              unsigned src_id, unsigned type)
-{
-        CGS_FUNC_ADEV;
-
-        if (!adev->irq.client[client_id].sources)
-                return -EINVAL;
-
-        return amdgpu_irq_get(adev, adev->irq.client[client_id].sources[src_id], type);
-}
-
-static int amdgpu_cgs_irq_put(void *cgs_device, unsigned client_id,
-                              unsigned src_id, unsigned type)
-{
-        CGS_FUNC_ADEV;
-
-        if (!adev->irq.client[client_id].sources)
-                return -EINVAL;
-
-        return amdgpu_irq_put(adev, adev->irq.client[client_id].sources[src_id], type);
-}
-
 static int amdgpu_cgs_set_clockgating_state(struct cgs_device *cgs_device,
                                   enum amd_ip_block_type block_type,
                                   enum amd_clockgating_state state)
@@ -795,12 +691,6 @@ static const struct cgs_ops amdgpu_cgs_ops = {
         .lock_grbm_idx = amdgpu_cgs_lock_grbm_idx,
 };
 
-static const struct cgs_os_ops amdgpu_cgs_os_ops = {
-        .add_irq_source = amdgpu_cgs_add_irq_source,
-        .irq_get = amdgpu_cgs_irq_get,
-        .irq_put = amdgpu_cgs_irq_put
-};
-
 struct cgs_device *amdgpu_cgs_create_device(struct amdgpu_device *adev)
 {
         struct amdgpu_cgs_device *cgs_device =
@@ -812,7 +702,6 @@ struct cgs_device *amdgpu_cgs_create_device(struct amdgpu_device *adev)
         }
 
         cgs_device->base.ops = &amdgpu_cgs_ops;
-        cgs_device->base.os_ops = &amdgpu_cgs_os_ops;
         cgs_device->adev = adev;
 
         return (struct cgs_device *)cgs_device;