From 4545cdce64dd721495a907982287fe80159fd8cb Mon Sep 17 00:00:00 2001 From: Miguel de Dios Date: Mon, 17 Feb 2025 18:22:39 +0800 Subject: [PATCH 1/3] msm: vidc/cvp: Fix handle_cmd_response parameter type Bug: 117299373 Change-Id: Iffee5fd84fb1340bed7585d3dfb438e7955f61c5 Signed-off-by: Miguel de Dios Signed-off-by: Flicker372 --- drivers/media/platform/msm/cvp/msm_cvp_common.c | 2 +- drivers/media/platform/msm/cvp/msm_cvp_internal.h | 2 +- techpack/video/msm/vidc/msm_vidc_common.c | 2 +- techpack/video/msm/vidc/msm_vidc_internal.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/media/platform/msm/cvp/msm_cvp_common.c b/drivers/media/platform/msm/cvp/msm_cvp_common.c index 22c8aa9441ad..75c9fe378f7b 100644 --- a/drivers/media/platform/msm/cvp/msm_cvp_common.c +++ b/drivers/media/platform/msm/cvp/msm_cvp_common.c @@ -767,7 +767,7 @@ static void handle_session_close(enum hal_command_response cmd, void *data) cvp_put_inst(inst); } -void cvp_handle_cmd_response(enum hal_command_response cmd, void *data) +void cvp_handle_cmd_response(u32 cmd, void *data) { dprintk(CVP_HFI, "Command response = %d\n", cmd); switch (cmd) { diff --git a/drivers/media/platform/msm/cvp/msm_cvp_internal.h b/drivers/media/platform/msm/cvp/msm_cvp_internal.h index 31495ad77d35..8bd02fce164e 100644 --- a/drivers/media/platform/msm/cvp/msm_cvp_internal.h +++ b/drivers/media/platform/msm/cvp/msm_cvp_internal.h @@ -326,7 +326,7 @@ struct msm_cvp_inst { extern struct msm_cvp_drv *cvp_driver; -void cvp_handle_cmd_response(enum hal_command_response cmd, void *data); +void cvp_handle_cmd_response(u32 cmd, void *data); int msm_cvp_trigger_ssr(struct msm_cvp_core *core, enum hal_ssr_trigger_type type); int msm_cvp_noc_error_info(struct msm_cvp_core *core); diff --git a/techpack/video/msm/vidc/msm_vidc_common.c b/techpack/video/msm/vidc/msm_vidc_common.c index a793677718c7..e0948658e3cc 100644 --- a/techpack/video/msm/vidc/msm_vidc_common.c +++ b/techpack/video/msm/vidc/msm_vidc_common.c @@ -2728,7 +2728,7 @@ exit: put_inst(inst); } -void handle_cmd_response(enum hal_command_response cmd, void *data) +void handle_cmd_response(u32 cmd, void *data) { switch (cmd) { case HAL_SYS_INIT_DONE: diff --git a/techpack/video/msm/vidc/msm_vidc_internal.h b/techpack/video/msm/vidc/msm_vidc_internal.h index 0f1614a613d3..a74630199b45 100644 --- a/techpack/video/msm/vidc/msm_vidc_internal.h +++ b/techpack/video/msm/vidc/msm_vidc_internal.h @@ -623,7 +623,7 @@ struct msm_vidc_ctrl { const char * const *qmenu; }; -void handle_cmd_response(enum hal_command_response cmd, void *data); +void handle_cmd_response(u32 cmd, void *data); int msm_vidc_trigger_ssr(struct msm_vidc_core *core, u64 trigger_ssr_val); int msm_vidc_noc_error_info(struct msm_vidc_core *core); From 605ff4b4b857a81586f5a57baffba604d62cdaa7 Mon Sep 17 00:00:00 2001 From: Flicker372 Date: Mon, 2 Mar 2026 23:27:23 +0800 Subject: [PATCH 2/3] msm: vidc/cvp: fix function type for hfi_cmd_response_callback Change-Id: I5ae2a546fa08343a7e16dc6aff8183c08a5f3ea2 Signed-off-by: Flicker372 flicker372@outlook.com --- drivers/media/platform/msm/cvp/cvp_hfi_api.h | 3 +-- techpack/video/msm/vidc/vidc_hfi_api.h | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/media/platform/msm/cvp/cvp_hfi_api.h b/drivers/media/platform/msm/cvp/cvp_hfi_api.h index 0a5ae01af744..c02627417ac6 100644 --- a/drivers/media/platform/msm/cvp/cvp_hfi_api.h +++ b/drivers/media/platform/msm/cvp/cvp_hfi_api.h @@ -357,8 +357,7 @@ struct cvp_hfi_device { int (*validate_session)(void *sess, const char *func); }; -typedef void (*hfi_cmd_response_callback) (enum hal_command_response cmd, - void *data); +typedef void (*hfi_cmd_response_callback) (u32 cmd, void *data); typedef void (*msm_cvp_callback) (enum hal_command_response response, void *callback); diff --git a/techpack/video/msm/vidc/vidc_hfi_api.h b/techpack/video/msm/vidc/vidc_hfi_api.h index 069185c1b0d8..63d2a4ca65a1 100644 --- a/techpack/video/msm/vidc/vidc_hfi_api.h +++ b/techpack/video/msm/vidc/vidc_hfi_api.h @@ -678,8 +678,7 @@ struct hfi_device { enum hal_default_properties (*get_default_properties)(void *dev); }; -typedef void (*hfi_cmd_response_callback) (enum hal_command_response cmd, - void *data); +typedef void (*hfi_cmd_response_callback) (u32 cmd, void *data); typedef void (*msm_vidc_callback) (enum hal_command_response response, void *callback); From 16c281182be71b958477c80830142d5e4d6fb885 Mon Sep 17 00:00:00 2001 From: duckyduckg Date: Sun, 17 May 2026 00:13:59 +0500 Subject: [PATCH 3/3] msm: vidc/cvp: fix callback type for msm_vidc/cvp_callback Change-Id: Id31de9aa86d78a046480fdbdbefba5e7b83b2a56 Signed-off-by: duckyduckg --- drivers/media/platform/msm/cvp/cvp_hfi_api.h | 3 +-- techpack/video/msm/vidc/vidc_hfi_api.h | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/media/platform/msm/cvp/cvp_hfi_api.h b/drivers/media/platform/msm/cvp/cvp_hfi_api.h index c02627417ac6..0606cbd865e1 100644 --- a/drivers/media/platform/msm/cvp/cvp_hfi_api.h +++ b/drivers/media/platform/msm/cvp/cvp_hfi_api.h @@ -358,8 +358,7 @@ struct cvp_hfi_device { }; typedef void (*hfi_cmd_response_callback) (u32 cmd, void *data); -typedef void (*msm_cvp_callback) (enum hal_command_response response, - void *callback); +typedef void (*msm_cvp_callback) (u32 response, void *callback); struct cvp_hfi_device *cvp_hfi_initialize(enum msm_cvp_hfi_type hfi_type, u32 device_id, struct msm_cvp_platform_resources *res, diff --git a/techpack/video/msm/vidc/vidc_hfi_api.h b/techpack/video/msm/vidc/vidc_hfi_api.h index 63d2a4ca65a1..17b28bcb0b3a 100644 --- a/techpack/video/msm/vidc/vidc_hfi_api.h +++ b/techpack/video/msm/vidc/vidc_hfi_api.h @@ -679,8 +679,7 @@ struct hfi_device { }; typedef void (*hfi_cmd_response_callback) (u32 cmd, void *data); -typedef void (*msm_vidc_callback) (enum hal_command_response response, - void *callback); +typedef void (*msm_vidc_callback) (u32 response, void *callback); struct hfi_device *vidc_hfi_initialize(enum msm_vidc_hfi_type hfi_type, u32 device_id, struct msm_vidc_platform_resources *res,