Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/amdgpu/powerplay: mv ppinterrupt.h to inc folder to share with other submodule.

Redefine interrupt callback function in accordance with cgs.

Signed-off-by: Rex Zhu <Rex.Zhu@amd.com>
Reviewed-by: Jammy Zhou <Jammy.Zhou@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Rex Zhu and committed by
Alex Deucher
251bb34f c28eae26

+26 -22
+19 -15
drivers/gpu/drm/amd/powerplay/hwmgr/ppinterrupt.h drivers/gpu/drm/amd/powerplay/inc/ppinterrupt.h
··· 20 20 * OTHER DEALINGS IN THE SOFTWARE. 21 21 * 22 22 */ 23 - #ifndef PP_INTERRUPT_H 24 - #define PP_INTERRUPT_H 25 23 26 - /** 27 - * The type of the interrupt callback functions in PowerPlay 28 - */ 29 - typedef void (*pp_interrupt_callback) (void *context, uint32_t ul_context_data); 24 + #ifndef _PP_INTERRUPT_H_ 25 + #define _PP_INTERRUPT_H_ 30 26 31 - /** 32 - * Event Manager action chain list information 33 - */ 34 - struct pp_interrupt_registration_info { 35 - pp_interrupt_callback callback; /* Pointer to callback function */ 36 - void *context; /* Pointer to callback function context */ 37 - uint32_t *interrupt_enable_id; /* Registered interrupt id */ 27 + enum amd_thermal_irq { 28 + AMD_THERMAL_IRQ_LOW_TO_HIGH = 0, 29 + AMD_THERMAL_IRQ_HIGH_TO_LOW, 30 + 31 + AMD_THERMAL_IRQ_LAST 38 32 }; 39 33 40 - typedef struct pp_interrupt_registration_info pp_interrupt_registration_info; 34 + /* The type of the interrupt callback functions in PowerPlay */ 35 + typedef int (*irq_handler_func_t)(void *private_data, 36 + unsigned src_id, const uint32_t *iv_entry); 41 37 42 - #endif 38 + /* Event Manager action chain list information */ 39 + struct pp_interrupt_registration_info { 40 + irq_handler_func_t call_back; /* Pointer to callback function */ 41 + void *context; /* Pointer to callback function context */ 42 + uint32_t src_id; /* Registered interrupt id */ 43 + const uint32_t *iv_entry; 44 + }; 45 + 46 + #endif /* _PP_INTERRUPT_H_ */
+7 -7
drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.h
··· 223 223 uint32_t vddc_vddci_delta; 224 224 uint32_t vddc_vddgfx_delta; 225 225 226 - pp_interrupt_registration_info internal_high_thermal_interrupt_info; 227 - pp_interrupt_registration_info internal_low_thermal_interrupt_info; 228 - pp_interrupt_registration_info smc_to_host_interrupt_info; 226 + struct pp_interrupt_registration_info internal_high_thermal_interrupt_info; 227 + struct pp_interrupt_registration_info internal_low_thermal_interrupt_info; 228 + struct pp_interrupt_registration_info smc_to_host_interrupt_info; 229 229 uint32_t active_auto_throttle_sources; 230 230 231 - pp_interrupt_registration_info external_throttle_interrupt; 232 - pp_interrupt_callback external_throttle_callback; 231 + struct pp_interrupt_registration_info external_throttle_interrupt; 232 + irq_handler_func_t external_throttle_callback; 233 233 void *external_throttle_context; 234 234 235 - pp_interrupt_registration_info ctf_interrupt_info; 236 - pp_interrupt_callback ctf_callback; 235 + struct pp_interrupt_registration_info ctf_interrupt_info; 236 + irq_handler_func_t ctf_callback; 237 237 void *ctf_context; 238 238 239 239 phw_tonga_clock_registers clock_registers;