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

Commit 698f88e6 authored by Rex Zhu's avatar Rex Zhu Committed by Alex Deucher
Browse files

drm/amd/powerplay: delete dead code in powerplay 



delete functiontable related codes

Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarRex Zhu <Rex.Zhu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent cf2623d9

drivers/gpu/drm/amd/powerplay/hwmgr/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
# Makefile for the 'hw manager' sub-component of powerplay.

# It provides the hardware management services for the driver.



HARDWARE_MGR = hwmgr.o processpptables.o functiontables.o \

HARDWARE_MGR = hwmgr.o processpptables.o \

		hardwaremanager.o pp_acpi.o cz_hwmgr.o \

		cz_clockpowergating.o pppcielanes.o\

		process_pptables_v1_0.o ppatomctrl.o ppatomfwctrl.o \

drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c

+1 −2
Original line number Diff line number Diff line
@@ -1142,8 +1142,7 @@ static int cz_hwmgr_backend_init(struct pp_hwmgr *hwmgr) 
		return -ENOMEM;



	hwmgr->backend = data;

	phm_cap_set(hwmgr->platform_descriptor.platformCaps,

			PHM_PlatformCaps_TablelessHardwareInterface);



	result = cz_initialize_dpm_defaults(hwmgr);

	if (result != 0) {

		pr_err("cz_initialize_dpm_defaults failed\n");

drivers/gpu/drm/amd/powerplay/hwmgr/functiontables.c

deleted100644 → 0
+0 −161
Original line number Diff line number Diff line 
/*

 * Copyright 2015 Advanced Micro Devices, Inc.

 *

 * Permission is hereby granted, free of charge, to any person obtaining a

 * copy of this software and associated documentation files (the "Software"),

 * to deal in the Software without restriction, including without limitation

 * the rights to use, copy, modify, merge, publish, distribute, sublicense,

 * and/or sell copies of the Software, and to permit persons to whom the

 * Software is furnished to do so, subject to the following conditions:

 *

 * The above copyright notice and this permission notice shall be included in

 * all copies or substantial portions of the Software.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

 * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

 * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

 * OTHER DEALINGS IN THE SOFTWARE.

 *

 */

#include <linux/types.h>

#include <linux/kernel.h>

#include <linux/slab.h>

#include "hwmgr.h"



static int phm_run_table(struct pp_hwmgr *hwmgr,

			 struct phm_runtime_table_header *rt_table,

			 void *input,

			 void *output,

			 void *temp_storage)

{

	int result = 0;

	phm_table_function *function;



	if (rt_table->function_list == NULL) {

		pr_debug("this function not implement!\n");

		return 0;

	}



	for (function = rt_table->function_list; NULL != *function; function++) {

		int tmp = (*function)(hwmgr, input, output, temp_storage, result);



		if (tmp == PP_Result_TableImmediateExit)

			break;

		if (tmp) {

			if (0 == result)

				result = tmp;

			if (rt_table->exit_error)

				break;

		}

	}



	return result;

}



int phm_dispatch_table(struct pp_hwmgr *hwmgr,

		       struct phm_runtime_table_header *rt_table,

		       void *input, void *output)

{

	int result;

	void *temp_storage;



	if (hwmgr == NULL || rt_table == NULL) {

		pr_err("Invalid Parameter!\n");

		return -EINVAL;

	}



	if (0 != rt_table->storage_size) {

		temp_storage = kzalloc(rt_table->storage_size, GFP_KERNEL);

		if (temp_storage == NULL) {

			pr_err("Could not allocate table temporary storage\n");

			return -ENOMEM;

		}

	} else {

		temp_storage = NULL;

	}



	result = phm_run_table(hwmgr, rt_table, input, output, temp_storage);



	kfree(temp_storage);



	return result;

}



int phm_construct_table(struct pp_hwmgr *hwmgr,

			const struct phm_master_table_header *master_table,

			struct phm_runtime_table_header *rt_table)

{

	uint32_t function_count = 0;

	const struct phm_master_table_item *table_item;

	uint32_t size;

	phm_table_function *run_time_list;

	phm_table_function *rtf;



	if (hwmgr == NULL || master_table == NULL || rt_table == NULL) {

		pr_err("Invalid Parameter!\n");

		return -EINVAL;

	}



	for (table_item = master_table->master_list;

		NULL != table_item->tableFunction; table_item++) {

		if ((NULL == table_item->isFunctionNeededInRuntimeTable) ||

		    (table_item->isFunctionNeededInRuntimeTable(hwmgr)))

			function_count++;

	}



	size = (function_count + 1) * sizeof(phm_table_function);

	run_time_list = kzalloc(size, GFP_KERNEL);



	if (NULL == run_time_list)

		return -ENOMEM;



	rtf = run_time_list;

	for (table_item = master_table->master_list;

		NULL != table_item->tableFunction; table_item++) {

		if ((rtf - run_time_list) > function_count) {

			pr_err("Check function results have changed\n");

			kfree(run_time_list);

			return -EINVAL;

		}



		if ((NULL == table_item->isFunctionNeededInRuntimeTable) ||

		     (table_item->isFunctionNeededInRuntimeTable(hwmgr))) {

			*(rtf++) = table_item->tableFunction;

		}

	}



	if ((rtf - run_time_list) > function_count) {

		pr_err("Check function results have changed\n");

		kfree(run_time_list);

		return -EINVAL;

	}



	*rtf = NULL;

	rt_table->function_list = run_time_list;

	rt_table->exit_error = (0 != (master_table->flags & PHM_MasterTableFlag_ExitOnError));

	rt_table->storage_size = master_table->storage_size;

	return 0;

}



int phm_destroy_table(struct pp_hwmgr *hwmgr,

		      struct phm_runtime_table_header *rt_table)

{

	if (hwmgr == NULL || rt_table == NULL) {

		pr_err("Invalid Parameter\n");

		return -EINVAL;

	}



	if (NULL == rt_table->function_list)

		return 0;



	kfree(rt_table->function_list);



	rt_table->function_list = NULL;

	rt_table->storage_size = 0;

	rt_table->exit_error = false;



	return 0;

}

drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c

+20 −73
Original line number Diff line number Diff line
@@ -36,29 +36,12 @@ 
			return -EINVAL;				\

	} while (0)



bool phm_is_hw_access_blocked(struct pp_hwmgr *hwmgr)

{

	return hwmgr->block_hw_access;

}



int phm_block_hw_access(struct pp_hwmgr *hwmgr, bool block)

{

	hwmgr->block_hw_access = block;

	return 0;

}



int phm_setup_asic(struct pp_hwmgr *hwmgr)

{

	PHM_FUNC_CHECK(hwmgr);



	if (phm_cap_enabled(hwmgr->platform_descriptor.platformCaps,

		PHM_PlatformCaps_TablelessHardwareInterface)) {

	if (NULL != hwmgr->hwmgr_func->asic_setup)

		return hwmgr->hwmgr_func->asic_setup(hwmgr);

	} else {

		return phm_dispatch_table(hwmgr, &(hwmgr->setup_asic),

					  NULL, NULL);

	}



	return 0;

}
@@ -67,14 +50,8 @@ int phm_power_down_asic(struct pp_hwmgr *hwmgr) 
{

	PHM_FUNC_CHECK(hwmgr);



	if (phm_cap_enabled(hwmgr->platform_descriptor.platformCaps,

		PHM_PlatformCaps_TablelessHardwareInterface)) {

	if (NULL != hwmgr->hwmgr_func->power_off_asic)

		return hwmgr->hwmgr_func->power_off_asic(hwmgr);

	} else {

		return phm_dispatch_table(hwmgr, &(hwmgr->power_down_asic),

					  NULL, NULL);

	}



	return 0;

}
@@ -90,13 +67,8 @@ int phm_set_power_state(struct pp_hwmgr *hwmgr, 
	states.pcurrent_state = pcurrent_state;

	states.pnew_state = pnew_power_state;



	if (phm_cap_enabled(hwmgr->platform_descriptor.platformCaps,

		PHM_PlatformCaps_TablelessHardwareInterface)) {

	if (NULL != hwmgr->hwmgr_func->power_state_set)

		return hwmgr->hwmgr_func->power_state_set(hwmgr, &states);

	} else {

		return phm_dispatch_table(hwmgr, &(hwmgr->set_power_state), &states, NULL);

	}



	return 0;

}
@@ -107,15 +79,8 @@ int phm_enable_dynamic_state_management(struct pp_hwmgr *hwmgr) 
	bool enabled;

	PHM_FUNC_CHECK(hwmgr);



	if (phm_cap_enabled(hwmgr->platform_descriptor.platformCaps,

		PHM_PlatformCaps_TablelessHardwareInterface)) {

	if (NULL != hwmgr->hwmgr_func->dynamic_state_management_enable)

		ret = hwmgr->hwmgr_func->dynamic_state_management_enable(hwmgr);

	} else {

		ret = phm_dispatch_table(hwmgr,

				&(hwmgr->enable_dynamic_state_management),

				NULL, NULL);

	}



	enabled = ret == 0;
@@ -131,15 +96,8 @@ int phm_disable_dynamic_state_management(struct pp_hwmgr *hwmgr) 


	PHM_FUNC_CHECK(hwmgr);



	if (phm_cap_enabled(hwmgr->platform_descriptor.platformCaps,

		PHM_PlatformCaps_TablelessHardwareInterface)) {

	if (hwmgr->hwmgr_func->dynamic_state_management_disable)

		ret = hwmgr->hwmgr_func->dynamic_state_management_disable(hwmgr);

	} else {

		ret = phm_dispatch_table(hwmgr,

				&(hwmgr->disable_dynamic_state_management),

				NULL, NULL);

	}



	enabled = ret == 0 ? false : true;
@@ -219,13 +177,9 @@ int phm_enable_clock_power_gatings(struct pp_hwmgr *hwmgr) 
{

	PHM_FUNC_CHECK(hwmgr);



	if (phm_cap_enabled(hwmgr->platform_descriptor.platformCaps,

		PHM_PlatformCaps_TablelessHardwareInterface)) {

	if (NULL != hwmgr->hwmgr_func->enable_clock_power_gating)

		return hwmgr->hwmgr_func->enable_clock_power_gating(hwmgr);

	} else {

		return phm_dispatch_table(hwmgr, &(hwmgr->enable_clock_power_gatings), NULL, NULL);

	}



	return 0;

}
@@ -233,11 +187,9 @@ int phm_disable_clock_power_gatings(struct pp_hwmgr *hwmgr) 
{

	PHM_FUNC_CHECK(hwmgr);



	if (phm_cap_enabled(hwmgr->platform_descriptor.platformCaps,

		PHM_PlatformCaps_TablelessHardwareInterface)) {

	if (NULL != hwmgr->hwmgr_func->disable_clock_power_gating)

		return hwmgr->hwmgr_func->disable_clock_power_gating(hwmgr);

	}



	return 0;

}
@@ -246,12 +198,9 @@ int phm_display_configuration_changed(struct pp_hwmgr *hwmgr) 
{

	PHM_FUNC_CHECK(hwmgr);



	if (phm_cap_enabled(hwmgr->platform_descriptor.platformCaps,

				 PHM_PlatformCaps_TablelessHardwareInterface)) {

	if (NULL != hwmgr->hwmgr_func->display_config_changed)

		hwmgr->hwmgr_func->display_config_changed(hwmgr);

	} else

		return phm_dispatch_table(hwmgr, &hwmgr->display_configuration_changed, NULL, NULL);



	return 0;

}
@@ -259,8 +208,6 @@ int phm_notify_smc_display_config_after_ps_adjustment(struct pp_hwmgr *hwmgr) 
{

	PHM_FUNC_CHECK(hwmgr);



	if (phm_cap_enabled(hwmgr->platform_descriptor.platformCaps,

				 PHM_PlatformCaps_TablelessHardwareInterface))

	if (NULL != hwmgr->hwmgr_func->notify_smc_display_config_after_ps_adjustment)

			hwmgr->hwmgr_func->notify_smc_display_config_after_ps_adjustment(hwmgr);

drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c

+0 −12
Original line number Diff line number Diff line
@@ -852,10 +852,6 @@ int polaris_set_asic_special_caps(struct pp_hwmgr *hwmgr) 
	phm_cap_set(hwmgr->platform_descriptor.platformCaps,

					PHM_PlatformCaps_AutomaticDCTransition);



	phm_cap_set(hwmgr->platform_descriptor.platformCaps,

				PHM_PlatformCaps_TablelessHardwareInterface);





	if (hwmgr->chip_id != CHIP_POLARIS10)

		phm_cap_set(hwmgr->platform_descriptor.platformCaps,

					PHM_PlatformCaps_SPLLShutdownSupport);
@@ -882,9 +878,6 @@ int fiji_set_asic_special_caps(struct pp_hwmgr *hwmgr) 
	phm_cap_unset(hwmgr->platform_descriptor.platformCaps,

			PHM_PlatformCaps_TCPRamping);



	phm_cap_set(hwmgr->platform_descriptor.platformCaps,

			PHM_PlatformCaps_TablelessHardwareInterface);



	return 0;

}
@@ -904,9 +897,6 @@ int tonga_set_asic_special_caps(struct pp_hwmgr *hwmgr) 
	phm_cap_unset(hwmgr->platform_descriptor.platformCaps,

		      PHM_PlatformCaps_VCEPowerGating);



	phm_cap_set(hwmgr->platform_descriptor.platformCaps,

			 PHM_PlatformCaps_TablelessHardwareInterface);



	return 0;

}
@@ -920,8 +910,6 @@ int topaz_set_asic_special_caps(struct pp_hwmgr *hwmgr) 
			PHM_PlatformCaps_TDRamping);

	phm_cap_unset(hwmgr->platform_descriptor.platformCaps,

			PHM_PlatformCaps_TCPRamping);

	phm_cap_set(hwmgr->platform_descriptor.platformCaps,

			 PHM_PlatformCaps_TablelessHardwareInterface);

	phm_cap_set(hwmgr->platform_descriptor.platformCaps,

		    PHM_PlatformCaps_EVV);

	return 0;