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

Commit 80572869 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: vidc: Adding debugfs support to vote video core clocks"

parents 4e2e16a1 e70c3b46

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

+12 −4
Original line number Diff line number Diff line
@@ -270,7 +270,7 @@ int msm_comm_vote_bus(struct msm_vidc_core *core) 
			vote_data[i].fps = inst->prop.fps;



		vote_data[i].power_mode = 0;

		if (!msm_vidc_clock_scaling || is_turbo ||

		if (msm_vidc_clock_voting || is_turbo ||

			inst->clk_data.buffer_counter < DCVS_FTB_WINDOW)

			vote_data[i].power_mode = VIDC_POWER_TURBO;
@@ -686,6 +686,14 @@ int msm_vidc_set_clocks(struct msm_vidc_core *core) 


		freq_core_max = max_t(unsigned long, freq_core_1, freq_core_2);



		if (msm_vidc_clock_voting) {

			dprintk(VIDC_PROF,

				"msm_vidc_clock_voting %d\n",

				 msm_vidc_clock_voting);

			freq_core_max = msm_vidc_clock_voting;

			break;

		}



		if (temp->clk_data.turbo_mode) {

			dprintk(VIDC_PROF,

				"Found an instance with Turbo request\n");
@@ -758,7 +766,7 @@ int msm_vidc_validate_operating_rate(struct msm_vidc_inst *inst, 
	operating_rate = operating_rate >> 16;



	if ((curr_operating_rate * (1 + ops_left)) >= operating_rate ||

			!msm_vidc_clock_scaling ||

			msm_vidc_clock_voting ||

			inst->clk_data.buffer_counter < DCVS_FTB_WINDOW) {

		dprintk(VIDC_DBG,

			"Requestd operating rate is valid %u\n",
@@ -820,7 +828,7 @@ int msm_comm_scale_clocks(struct msm_vidc_inst *inst) 
	inst->clk_data.min_freq = freq;



	if (inst->clk_data.buffer_counter < DCVS_FTB_WINDOW ||

		!msm_vidc_clock_scaling)

		msm_vidc_clock_voting)

		inst->clk_data.min_freq = msm_vidc_max_freq(inst->core);

	else

		inst->clk_data.min_freq = freq;
@@ -861,7 +869,7 @@ int msm_dcvs_try_enable(struct msm_vidc_inst *inst) 
		return -EINVAL;

	}



	if (!msm_vidc_clock_scaling ||

	if (msm_vidc_clock_voting ||

			inst->flags & VIDC_THUMBNAIL ||

			inst->clk_data.low_latency_mode) {

		dprintk(VIDC_PROF,

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

+3 −3
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ int msm_vidc_fw_debug_mode = 1; 
int msm_vidc_fw_low_power_mode = 1;

bool msm_vidc_fw_coverage = !true;

bool msm_vidc_thermal_mitigation_disabled = !true;

bool msm_vidc_clock_scaling = true;

int msm_vidc_clock_voting = !1;

bool msm_vidc_syscache_disable = !true;



#define MAX_DBG_BUF_SIZE 4096
@@ -200,8 +200,8 @@ struct dentry *msm_vidc_debugfs_init_drv(void) 
	__debugfs_create(u32, "debug_output", &msm_vidc_debug_out) &&

	__debugfs_create(bool, "disable_thermal_mitigation",

			&msm_vidc_thermal_mitigation_disabled) &&

	__debugfs_create(bool, "clock_scaling",

			&msm_vidc_clock_scaling) &&

	__debugfs_create(u32, "core_clock_voting",

			&msm_vidc_clock_voting) &&

	__debugfs_create(bool, "disable_video_syscache",

			&msm_vidc_syscache_disable);

drivers/media/platform/msm/vidc/msm_vidc_debug.h

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ extern int msm_vidc_fw_debug_mode; 
extern int msm_vidc_fw_low_power_mode;

extern bool msm_vidc_fw_coverage;

extern bool msm_vidc_thermal_mitigation_disabled;

extern bool msm_vidc_clock_scaling;

extern int msm_vidc_clock_voting;

extern bool msm_vidc_syscache_disable;



#define dprintk(__level, __fmt, arg...)	\