Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b388677 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: vidc: Disable power collapse for HFR"

parents 1221a469 a7cf384b

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

+0 −16
Original line number Diff line number Diff line
@@ -1737,19 +1737,6 @@ static struct vb2_buffer *get_vb_from_device_addr(struct buf_queue *bufq, 
	return vb;

}



static void msm_vidc_try_suspend(struct msm_vidc_inst *inst)

{

	bool batch_mode;



	batch_mode = msm_comm_g_ctrl_for_id(inst, V4L2_CID_VIDC_QBUF_MODE)

		== V4L2_VIDC_QBUF_BATCHED;

	if (batch_mode) {

		dprintk(VIDC_DBG,

			"Trying to suspend Venus after finishing Batch\n");

		msm_comm_suspend(inst->core->id);

	}

}



static void handle_ebd(enum hal_command_response cmd, void *data)

{

	struct msm_vidc_cb_data_done *response = data;
@@ -1821,8 +1808,6 @@ static void handle_ebd(enum hal_command_response cmd, void *data) 
		msm_vidc_debugfs_update(inst, MSM_VIDC_DEBUGFS_EVENT_EBD);

	}



	msm_vidc_try_suspend(inst);



	put_inst(inst);

}
@@ -2121,7 +2106,6 @@ static void handle_fbd(enum hal_command_response cmd, void *data) 
		msm_vidc_debugfs_update(inst, MSM_VIDC_DEBUGFS_EVENT_FBD);

	}



	msm_vidc_try_suspend(inst);

err_handle_fbd:

	put_inst(inst);

}