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

Commit 3ac7df01 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: debugfs support for handling syscache" into msm-4.9

parents 05accea0 0634e2ab

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

+3 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ int msm_vidc_firmware_unload_delay = 15000; 
bool msm_vidc_thermal_mitigation_disabled = !true;

bool msm_vidc_clock_scaling = true;

bool msm_vidc_debug_timeout = !true;

bool msm_vidc_syscache_disable = true;



#define MAX_DBG_BUF_SIZE 4096
@@ -186,6 +187,8 @@ struct dentry *msm_vidc_debugfs_init_drv(void) 
			&msm_vidc_clock_scaling) &&

	__debugfs_create(bool, "debug_timeout",

			&msm_vidc_debug_timeout);

	__debugfs_create(bool, "disable_video_syscache",

			&msm_vidc_syscache_disable);



#undef __debugfs_create

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

+1 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ extern int msm_vidc_firmware_unload_delay; 
extern bool msm_vidc_thermal_mitigation_disabled;

extern bool msm_vidc_clock_scaling;

extern bool msm_vidc_debug_timeout;

extern bool msm_vidc_syscache_disable;



#define VIDC_MSG_PRIO2STRING(__level) ({ \

	char *__str; \

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

+2 −2
Original line number Diff line number Diff line
@@ -3769,7 +3769,7 @@ static int __enable_subcaches(struct venus_hfi_device *device) 
	struct hfi_resource_subcache_type *sc_res;

	struct vidc_resource_hdr rhdr;



	if (!is_sys_cache_present(device))

	if (msm_vidc_syscache_disable || !is_sys_cache_present(device))

		return 0;



	memset((void *)resource, 0x0, (sizeof(u32) * VIDC_MAX_SUBCACHE_SIZE));
@@ -3837,7 +3837,7 @@ static int __disable_subcaches(struct venus_hfi_device *device) 
	struct hfi_resource_subcache_type *sc_res;

	struct vidc_resource_hdr rhdr;



	if (!is_sys_cache_present(device))

	if (msm_vidc_syscache_disable || !is_sys_cache_present(device))

		return 0;



	dprintk(VIDC_DBG, "Disabling Subcaches\n");