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

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

Merge "msm: cvp: disable cache op by default"

parents a05e4a35 f079c149

drivers/media/platform/msm/cvp/msm_cvp_buf.c

+4 −3
Original line number Diff line number Diff line
@@ -233,10 +233,8 @@ void msm_cvp_cache_operations(struct msm_cvp_smem *smem, u32 type, 
{

	enum smem_cache_ops cache_op;



	if (!msm_cvp_cacheop_enabled) {

		dprintk(CVP_MEM, "%s: cache operation not enabled\n", __func__);

	if (msm_cvp_cacheop_disabled)

		return;

	}



	if (!smem) {

		dprintk(CVP_ERR, "%s: invalid params\n", __func__);
@@ -254,6 +252,9 @@ void msm_cvp_cache_operations(struct msm_cvp_smem *smem, u32 type, 
		cache_op = SMEM_CACHE_CLEAN_INVALIDATE;

	}



	dprintk(CVP_MEM,

		"%s: cache operation enabled for dma_buf: %llx, cache_op: %d, offset: %d, size: %d\n",

		__func__, smem->dma_buf, cache_op, offset, size);

	msm_cvp_smem_cache_operations(smem->dma_buf, cache_op, offset, size);

}

drivers/media/platform/msm/cvp/msm_cvp_debug.c

+3 −3
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ int msm_cvp_fw_debug_mode = 1; 
int msm_cvp_fw_low_power_mode = 1;

bool msm_cvp_fw_coverage = !true;

bool msm_cvp_thermal_mitigation_disabled = !true;

bool msm_cvp_cacheop_enabled = true;

bool msm_cvp_cacheop_disabled = true;

int msm_cvp_clock_voting = !1;

bool msm_cvp_syscache_disable = !true;

bool msm_cvp_dsp_disable = !true;
@@ -259,8 +259,8 @@ struct dentry *msm_cvp_debugfs_init_drv(void) 
	__debugfs_create(u32, "debug_output", &msm_cvp_debug_out) &&

	__debugfs_create(bool, "disable_thermal_mitigation",

			&msm_cvp_thermal_mitigation_disabled) &&

	__debugfs_create(bool, "enable_cacheop",

			&msm_cvp_cacheop_enabled) &&

	__debugfs_create(bool, "disable_cacheop",

			&msm_cvp_cacheop_disabled) &&

	__debugfs_create(bool, "disable_cvp_syscache",

			&msm_cvp_syscache_disable);

drivers/media/platform/msm/cvp/msm_cvp_debug.h

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ extern int msm_cvp_fw_debug_mode; 
extern int msm_cvp_fw_low_power_mode;

extern bool msm_cvp_fw_coverage;

extern bool msm_cvp_thermal_mitigation_disabled;

extern bool msm_cvp_cacheop_enabled;

extern bool msm_cvp_cacheop_disabled;

extern int msm_cvp_clock_voting;

extern bool msm_cvp_syscache_disable;

extern bool msm_cvp_dsp_disable;