Merge "msm: vidc : Handle power collapse properly in venus HFI" (5661babe) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/media/platform/msm/vidc/hfi_response_handler.c

+13 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1495,6 +1495,17 @@ static int hfi_process_sys_property_info(u32 device_id,

	}		}

			static int hfi_process_sys_pc_prep_done(u32 device_id,
			struct vidc_hal_msg_pkt_hdr *msg_hdr,
			struct msm_vidc_cb_info *info)
			{
			*info = (struct msm_vidc_cb_info) {
			.response_type = HAL_SYS_PC_PREP_DONE,
			};

			return 0;
			}

	static int hfi_process_ignore(u32 device_id,		static int hfi_process_ignore(u32 device_id,
	struct vidc_hal_msg_pkt_hdr *msg_hdr,		struct vidc_hal_msg_pkt_hdr *msg_hdr,
	struct msm_vidc_cb_info *info)		struct msm_vidc_cb_info *info)
	@@ -1572,6 +1583,8 @@ int hfi_process_msg_packet(u32 device_id, struct vidc_hal_msg_pkt_hdr *msg_hdr,
	pkt_func = (pkt_func_def)hfi_process_session_abort_done;		pkt_func = (pkt_func_def)hfi_process_session_abort_done;
	break;		break;
	case HFI_MSG_SYS_PC_PREP_DONE:		case HFI_MSG_SYS_PC_PREP_DONE:
			pkt_func = (pkt_func_def)hfi_process_sys_pc_prep_done;
			break;
	case HFI_MSG_SESSION_SYNC_DONE:		case HFI_MSG_SESSION_SYNC_DONE:
	pkt_func = (pkt_func_def)hfi_process_ignore;		pkt_func = (pkt_func_def)hfi_process_ignore;
	break;		break;

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -3543,6 +3543,12 @@ static struct msm_vidc_cb_info *__response_handler(
	case HAL_SYS_PC_PREP_DONE:		case HAL_SYS_PC_PREP_DONE:
	dprintk(VIDC_DBG, "Received SYS_PC_PREP_DONE\n");		dprintk(VIDC_DBG, "Received SYS_PC_PREP_DONE\n");
	complete(&pc_prep_done);		complete(&pc_prep_done);
			/*
			* PC_PREP_DONE should be the last packet during
			* power collapse, so decrement the packet count
			* to not process this pkt in callback
			*/
			--packet_count;
	break;		break;
	default:		default:
	break;		break;