Merge "msm: vidc: fix kw issues" (3dc916d2) · Commits · e / devices / android_kernel_fairphone_FP4

msm/vidc/msm_cvp_internal.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -106,8 +106,8 @@ void handle_session_register_buffer_done(enum hal_command_response cmd,
		v4l2_event_queue_fh(&inst->event_handler, &event);

		exit:
		put_inst(inst);
		s_vpr_l(inst->sid, "handled: SESSION_REGISTER_BUFFER_DONE\n");
		put_inst(inst);
		}

		void handle_session_unregister_buffer_done(enum hal_command_response cmd,
		@@ -170,8 +170,8 @@ void handle_session_unregister_buffer_done(enum hal_command_response cmd,
		kfree(cbuf);
		cbuf = NULL;
		exit:
		put_inst(inst);
		s_vpr_l(inst->sid, "handled: SESSION_UNREGISTER_BUFFER_DONE\n");
		put_inst(inst);
		}

		static void print_cvp_cycles(struct msm_vidc_inst *inst)

msm/vidc/msm_venc.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -4368,7 +4368,7 @@ int handle_all_intra_restrictions(struct msm_vidc_inst *inst)
		n_fps = inst->clk_data.frame_rate >> 16;
		fps_max = capability->cap[CAP_ALLINTRA_MAX_FPS].max;
		s_vpr_h(inst->sid, "%s: rc_type %u, fps %u, fps_max %u\n",
		inst->rc_type, n_fps, fps_max);
		__func__, inst->rc_type, n_fps, fps_max);
		if ((inst->rc_type != V4L2_MPEG_VIDEO_BITRATE_MODE_VBR &&
		inst->rc_type != RATE_CONTROL_OFF &&
		inst->rc_type != RATE_CONTROL_LOSSLESS) \|\|

msm/vidc/msm_vidc_common.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -1252,8 +1252,8 @@ static void handle_session_release_buf_done(enum hal_command_response cmd,
		else
		s_vpr_e(inst->sid, "Invalid inst cmd response: %d\n", cmd);

		put_inst(inst);
		s_vpr_l(inst->sid, "handled: SESSION_RELEASE_BUFFER_DONE\n");
		put_inst(inst);
		}

		static void handle_sys_release_res_done(
		@@ -1894,8 +1894,8 @@ static void handle_load_resource_done(enum hal_command_response cmd, void *data)
		msm_comm_generate_session_error(inst);
		}

		put_inst(inst);
		s_vpr_l(inst->sid, "handled: SESSION_LOAD_RESOURCE_DONE\n");
		put_inst(inst);
		}

		static void handle_start_done(enum hal_command_response cmd, void *data)
		@@ -2111,8 +2111,8 @@ static void handle_session_flush(enum hal_command_response cmd, void *data)

		exit:
		mutex_unlock(&inst->flush_lock);
		put_inst(inst);
		s_vpr_l(inst->sid, "handled: SESSION_FLUSH_DONE\n");
		put_inst(inst);
		}

		static void handle_session_error(enum hal_command_response cmd, void *data)
		@@ -2161,8 +2161,8 @@ static void handle_session_error(enum hal_command_response cmd, void *data)
		/* change state before sending error to client */
		change_inst_state(inst, MSM_VIDC_CORE_INVALID);
		msm_vidc_queue_v4l2_event(inst, event);
		put_inst(inst);
		s_vpr_l(inst->sid, "handled: SESSION_ERROR\n");
		put_inst(inst);
		}

		static void msm_comm_clean_notify_client(struct msm_vidc_core *core)
		@@ -2512,8 +2512,8 @@ static void handle_ebd(enum hal_command_response cmd, void *data)
		msm_vidc_debugfs_update(inst, MSM_VIDC_DEBUGFS_EVENT_EBD);
		kref_put_mbuf(mbuf);
		exit:
		put_inst(inst);
		s_vpr_l(inst->sid, "handled: SESSION_ETB_DONE\n");
		put_inst(inst);
		}

		static int handle_multi_stream_buffers(struct msm_vidc_inst *inst,
		@@ -2689,8 +2689,8 @@ static void handle_fbd(enum hal_command_response cmd, void *data)
		kref_put_mbuf(mbuf);

		exit:
		put_inst(inst);
		s_vpr_l(inst->sid, "handled: SESSION_FTB_DONE\n");
		put_inst(inst);
		}

		void handle_cmd_response(enum hal_command_response cmd, void *data)