Merge "msm: vidc: Remove Idle indicator configuration" (5ccbb5f0) · Commits · e / devices / android_kernel_oneplus_sm8150

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

+0 −20

Original line number	Diff line number	Diff line
		@@ -264,25 +264,6 @@ int create_pkt_cmd_sys_pc_prep(struct hfi_cmd_sys_pc_prep_packet *pkt)
		return rc;
		}

		int create_pkt_cmd_sys_idle_indicator(
		struct hfi_cmd_sys_set_property_packet *pkt,
		u32 enable)
		{
		struct hfi_enable *hfi;

		if (!pkt)
		return -EINVAL;

		pkt->size = sizeof(struct hfi_cmd_sys_set_property_packet) +
		sizeof(struct hfi_enable) + sizeof(u32);
		pkt->packet_type = HFI_CMD_SYS_SET_PROPERTY;
		pkt->num_properties = 1;
		pkt->rg_property_data[0] = HFI_PROPERTY_SYS_IDLE_INDICATOR;
		hfi = (struct hfi_enable *) &pkt->rg_property_data[1];
		hfi->enable = enable;
		return 0;
		}

		int create_pkt_cmd_sys_debug_config(
		struct hfi_cmd_sys_set_property_packet *pkt,
		u32 mode)
		@@ -2031,7 +2012,6 @@ int create_pkt_cmd_session_sync_process(
		static struct hfi_packetization_ops hfi_default = {
		.sys_init = create_pkt_cmd_sys_init,
		.sys_pc_prep = create_pkt_cmd_sys_pc_prep,
		.sys_idle_indicator = create_pkt_cmd_sys_idle_indicator,
		.sys_power_control = create_pkt_cmd_sys_power_control,
		.sys_set_resource = create_pkt_cmd_sys_set_resource,
		.sys_debug_config = create_pkt_cmd_sys_debug_config,

+0 −2

Original line number	Diff line number	Diff line
		@@ -29,8 +29,6 @@ enum hfi_packetization_type {
		struct hfi_packetization_ops {
		int (sys_init)(struct hfi_cmd_sys_init_packet pkt, u32 arch_type);
		int (sys_pc_prep)(struct hfi_cmd_sys_pc_prep_packet pkt);
		int (sys_idle_indicator)(struct hfi_cmd_sys_set_property_packet pkt,
		u32 enable);
		int (sys_power_control)(struct hfi_cmd_sys_set_property_packet pkt,
		u32 enable);
		int (*sys_set_resource)(

+1 −4

Original line number	Diff line number	Diff line
		/* Copyright (c) 2012-2017, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -26,7 +26,6 @@ int msm_vidc_fw_debug = 0x18;
		int msm_vidc_fw_debug_mode = 1;
		int msm_vidc_fw_low_power_mode = 1;
		bool msm_vidc_fw_coverage = !true;
		bool msm_vidc_sys_idle_indicator = !true;
		bool msm_vidc_thermal_mitigation_disabled = !true;
		bool msm_vidc_clock_scaling = true;
		bool msm_vidc_syscache_disable = !true;
		@@ -199,8 +198,6 @@ struct dentry *msm_vidc_debugfs_init_drv(void)
		__debugfs_create(u32, "fw_low_power_mode",
		&msm_vidc_fw_low_power_mode) &&
		__debugfs_create(u32, "debug_output", &msm_vidc_debug_out) &&
		__debugfs_create(bool, "sys_idle_indicator",
		&msm_vidc_sys_idle_indicator) &&
		__debugfs_create(bool, "disable_thermal_mitigation",
		&msm_vidc_thermal_mitigation_disabled) &&
		__debugfs_create(bool, "clock_scaling",

+0 −1

Original line number	Diff line number	Diff line
		@@ -57,7 +57,6 @@ extern int msm_vidc_fw_debug;
		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_sys_idle_indicator;
		extern bool msm_vidc_thermal_mitigation_disabled;
		extern bool msm_vidc_clock_scaling;
		extern bool msm_vidc_syscache_disable;

+0 −2

Original line number	Diff line number	Diff line
		@@ -765,8 +765,6 @@ int read_platform_resources_from_drv_data(

		res->slave_side_cp = find_key_value(platform_data,
		"qcom,slave-side-cp");
		res->sys_idle_indicator = find_key_value(platform_data,
		"qcom,enable-idle-indicator");
		res->thermal_mitigable = find_key_value(platform_data,
		"qcom,enable-thermal-mitigation");
		res->msm_vidc_pwr_collapse_delay = find_key_value(platform_data,