A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-05 19:31:57 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'sm8350/lineage-20' into lineage-23.2

Browse source 
* sm8350/lineage-20:
  msm: vidc/cvp: fix callback type for msm_vidc/cvp_callback
  msm: vidc/cvp: fix function type for hfi_cmd_response_callback
  msm: vidc/cvp: Fix handle_cmd_response parameter type

Change-Id: I653aa4fac07801578e806b639e91d9361db5fe36
This commit is contained in:
Michael Bestas 2026-05-18 00:15:45 +03:00
commit b0eb683125
No known key found for this signature in database
6 changed files with 8 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
drivers/media/platform/msm/cvp/cvp_hfi_api.h
View file

@ -357,10 +357,8 @@ 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 (*msm_cvp_callback) (enum hal_command_response response,
void *callback);
typedef void (*hfi_cmd_response_callback) (u32 cmd, void *data);
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,

2
drivers/media/platform/msm/cvp/msm_cvp_common.c
View file

@ -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) {

2
drivers/media/platform/msm/cvp/msm_cvp_internal.h
View file

@ -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);

2
techpack/video/msm/vidc/msm_vidc_common.c
View file

@ -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:

2
techpack/video/msm/vidc/msm_vidc_internal.h
View file

@ -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);

6
techpack/video/msm/vidc/vidc_hfi_api.h
View file

@ -678,10 +678,8 @@ 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 (*msm_vidc_callback) (enum hal_command_response response,
void *callback);
typedef void (*hfi_cmd_response_callback) (u32 cmd, void *data);
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,