diff options
Diffstat (limited to 'drivers/gpu/drm/amd/powerplay/hwmgr')
| -rw-r--r-- | drivers/gpu/drm/amd/powerplay/hwmgr/ppinterrupt.h | 42 | ||||
| -rw-r--r-- | drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.h | 14 |
2 files changed, 7 insertions, 49 deletions
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/ppinterrupt.h b/drivers/gpu/drm/amd/powerplay/hwmgr/ppinterrupt.h deleted file mode 100644 index 7269ac1cd8b4..000000000000 --- a/drivers/gpu/drm/amd/powerplay/hwmgr/ppinterrupt.h +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright 2015 Advanced Micro Devices, Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR - * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. - * - */ -#ifndef PP_INTERRUPT_H -#define PP_INTERRUPT_H - -/** - * The type of the interrupt callback functions in PowerPlay - */ -typedef void (*pp_interrupt_callback) (void *context, uint32_t ul_context_data); - -/** - * Event Manager action chain list information - */ -struct pp_interrupt_registration_info { - pp_interrupt_callback callback; /* Pointer to callback function */ - void *context; /* Pointer to callback function context */ - uint32_t *interrupt_enable_id; /* Registered interrupt id */ -}; - -typedef struct pp_interrupt_registration_info pp_interrupt_registration_info; - -#endif diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.h b/drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.h index c3ac966bfe6b..d773d12258d2 100644 --- a/drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.h +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.h @@ -223,17 +223,17 @@ struct tonga_hwmgr { uint32_t vddc_vddci_delta; uint32_t vddc_vddgfx_delta; - pp_interrupt_registration_info internal_high_thermal_interrupt_info; - pp_interrupt_registration_info internal_low_thermal_interrupt_info; - pp_interrupt_registration_info smc_to_host_interrupt_info; + struct pp_interrupt_registration_info internal_high_thermal_interrupt_info; + struct pp_interrupt_registration_info internal_low_thermal_interrupt_info; + struct pp_interrupt_registration_info smc_to_host_interrupt_info; uint32_t active_auto_throttle_sources; - pp_interrupt_registration_info external_throttle_interrupt; - pp_interrupt_callback external_throttle_callback; + struct pp_interrupt_registration_info external_throttle_interrupt; + irq_handler_func_t external_throttle_callback; void *external_throttle_context; - pp_interrupt_registration_info ctf_interrupt_info; - pp_interrupt_callback ctf_callback; + struct pp_interrupt_registration_info ctf_interrupt_info; + irq_handler_func_t ctf_callback; void *ctf_context; phw_tonga_clock_registers clock_registers; |