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

Unverified Commit b2f41ebc authored by Gagan Malvi's avatar Gagan Malvi Committed by Gagan Malvi
Browse files

drivers/misc/mediatek: vpu: Fix VPU logspam. 



Signed-off-by: default avatarGagan Malvi <malvi@aospa.co>
Change-Id: I64fc24ccae15608c107e234911121d6c3abd660d
parent 3c5c94c4

drivers/misc/mediatek/vpu/1.0/vpu_cmn.h

+1 −1
Original line number Diff line number Diff line
@@ -398,7 +398,7 @@ int vpu_init_reg(struct vpu_device *vpu_dev); 
/* LOG & AEE */

#define VPU_TAG "[vpu]"

#define LOG_DBG(format, args...)    pr_debug(VPU_TAG " " format, ##args)

#define LOG_INF(format, args...)    pr_info(VPU_TAG " " format, ##args)

#define LOG_DBG(format, args...)    pr_info(VPU_TAG " " format, ##args)

#define LOG_WRN(format, args...)    pr_debug(VPU_TAG " " format, ##args)

#define LOG_ERR(format, args...)    pr_debug(VPU_TAG "[error] " format, ##args)

drivers/misc/mediatek/vpu/1.0/vpu_dbg.c

+5 −5
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ static void vpu_test_wpp(void) 


	/* compare with golden */

	ret = memcmp(buf_va + img_size, g_datadst_640x360_golden_wpp, img_size);

	LOG_INF("comparison result:%d", ret);

	LOG_DBG("comparison result:%d", ret);

	vpu_save_file("/data/vpu_result_wpp.raw", buf_va + img_size, img_size);



	vpu_free_request(req);
@@ -237,7 +237,7 @@ static void vpu_test_be_true(void) 
	 */

	memset(buf_va, 0x2, width * height);

	ret = memcmp(buf_va, buf_va + width * height, width * height);

	LOG_INF("vpu test: comparison result=%d and param5=%d", ret,

	LOG_DBG("vpu test: comparison result=%d and param5=%d", ret,

		sett->param5);



	vpu_free_request(req);
@@ -405,7 +405,7 @@ static int vpu_test_set(void *data, u64 val) 
	struct vpu_algo *algo;

	struct vpu_request *req;



	LOG_INF("vpu_test_set:val=%llu\n", val);

	LOG_DBG("vpu_test_set:val=%llu\n", val);



	switch (val) {

	case 0:
@@ -528,7 +528,7 @@ static int vpu_test_set(void *data, u64 val) 
		vpu_user_test_case3(NULL);

		break;

	default:

		LOG_INF("vpu_test_set error,val=%llu\n", val);

		LOG_DBG("vpu_test_set error,val=%llu\n", val);

	}



	test_value = val;
@@ -548,7 +548,7 @@ DEFINE_SIMPLE_ATTRIBUTE(vpu_debug_test_fops, vpu_test_get, vpu_test_set, 
static int vpu_log_level_set(void *data, u64 val)

{

	g_vpu_log_level = val & 0xf;

	LOG_INF("g_vpu_log_level: %d\n", g_vpu_log_level);

	LOG_DBG("g_vpu_log_level: %d\n", g_vpu_log_level);



	return 0;

}

drivers/misc/mediatek/vpu/1.0/vpu_drv.c

+6 −6
Original line number Diff line number Diff line
@@ -696,9 +696,9 @@ static int vpu_mmap(struct file *flip, struct vm_area_struct *vma) 
	vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);

	pfn = vma->vm_pgoff << PAGE_SHIFT;



	LOG_INF("vpu_mmap: vm_pgoff(0x%lx),pfn(0x%x),phy(0x%lx)",

	LOG_DBG("vpu_mmap: vm_pgoff(0x%lx),pfn(0x%x),phy(0x%lx)",

			vma->vm_pgoff, pfn, vma->vm_pgoff << PAGE_SHIFT);

	LOG_INF("vpu_mmap: vm_start(0x%lx), vm_end(0x%lx), length(0x%lx)\n",

	LOG_DBG("vpu_mmap: vm_start(0x%lx), vm_end(0x%lx), length(0x%lx)\n",

			vma->vm_start, vma->vm_end, length);



	switch (pfn) {
@@ -777,7 +777,7 @@ static int vpu_probe(struct platform_device *pdev) 


	node = pdev->dev.of_node;

	vpu_device->dev = &pdev->dev;

	LOG_INF("probe 0, pdev id = %d name = %s\n", pdev->id, pdev->name);

	LOG_DBG("probe 0, pdev id = %d name = %s\n", pdev->id, pdev->name);



#ifdef MTK_VPU_EMULATOR

	/* emulator will fill vpu_base and bin_base */
@@ -796,7 +796,7 @@ static int vpu_probe(struct platform_device *pdev) 
			return -ENODEV;

		}



		LOG_INF("probe 1, phy_addr: 0x%x, phy_size: 0x%x\n",

		LOG_DBG("probe 1, phy_addr: 0x%x, phy_size: 0x%x\n",

				phy_addr, phy_size);

		vpu_device->bin_base = (uint64_t)ioremap_wc(phy_addr, phy_size);

		vpu_device->bin_pa = phy_addr;
@@ -805,7 +805,7 @@ static int vpu_probe(struct platform_device *pdev) 
#endif



	vpu_device->irq_num = irq_of_parse_and_map(node, 0);

	LOG_INF("probe2, vpu_base_0x%lx, bin_base_0x%lx, irq_num,pdev: %d_%p\n",

	LOG_DBG("probe2, vpu_base_0x%lx, bin_base_0x%lx, irq_num,pdev: %d_%p\n",

		 vpu_device->vpu_base,  vpu_device->bin_base,

		 vpu_device->irq_num, vpu_device->dev);
@@ -848,7 +848,7 @@ static int vpu_probe(struct platform_device *pdev) 
			vpu_unreg_chardev();

	}



	LOG_INF("probe vpu driver\n");

	LOG_DBG("probe vpu driver\n");

	return ret;

}

drivers/misc/mediatek/vpu/2.0/vpu_algo.c

+5 −5
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ int vpu_get_algo_id_by_name(int core, char *name) 
	}



	algo_id = algo->id[core];

	LOG_INF("vpu(%d)_get algo_id:%d\n", core, algo_id);

	LOG_DBG("vpu(%d)_get algo_id:%d\n", core, algo_id);

	return algo_id;



out:
@@ -245,7 +245,7 @@ int vpu_create_algo(int core, char *name, 
	LOG_DBG("[vpu] vpu_hw_load_algo done, (%d/0x%lx/0x%x)\n",

		id, (unsigned long)mva, length);



	LOG_INF("[vpu_%d] vpu_hw_load_algo done, (%d/0x%lx/0x%x)\n",

	LOG_DBG("[vpu_%d] vpu_hw_load_algo done, (%d/0x%lx/0x%x)\n",

		core, algo->id[core],

		(unsigned long)(algo->bin_ptr), algo->bin_length);
@@ -264,7 +264,7 @@ int vpu_create_algo(int core, char *name, 
			goto out;

		}



		LOG_INF("[vpu_%d] vpu_hw_get_algo_info done\n", core);

		LOG_DBG("[vpu_%d] vpu_hw_get_algo_info done\n", core);



		ret = vpu_calc_prop_offset(algo->info_descs,

				algo->info_desc_count, &algo->info_length);
@@ -273,7 +273,7 @@ int vpu_create_algo(int core, char *name, 
			goto out;

		}



		LOG_INF("[vpu_%d] vpu_calc_prop_offset done, %s(0x%x)\n",

		LOG_DBG("[vpu_%d] vpu_calc_prop_offset done, %s(0x%x)\n",

				core,

				"algo->info_length", algo->info_length);
@@ -284,7 +284,7 @@ int vpu_create_algo(int core, char *name, 
			goto out;

		}



		LOG_INF("[vpu_%d] vpu_calc_prop_offset done, %s(0x%x)\n",

		LOG_DBG("[vpu_%d] vpu_calc_prop_offset done, %s(0x%x)\n",

				core,

				"algo->sett_length", algo->sett_length);

	}

drivers/misc/mediatek/vpu/2.0/vpu_cmn.h

+1 −1
Original line number Diff line number Diff line
@@ -505,7 +505,7 @@ void vpu_met_event_leave(int core, int algo_id); 
#else

#define LOG_DBG(format, args...)

#endif

#define LOG_INF(format, args...)    pr_info(VPU_TAG " " format, ##args)

#define LOG_DBG(format, args...)    pr_info(VPU_TAG " " format, ##args)

#define LOG_WRN(format, args...)    pr_info(VPU_TAG "[warn] " format, ##args)

#define LOG_ERR(format, args...)    pr_info(VPU_TAG "[error] " format, ##args)