Commit 137d63ab authored by Huang Rui's avatar Huang Rui Committed by Alex Deucher
Browse files

drm/amd/powerplay: add new smu ip block 



This patch add amdgpu_smu ip block skeleton as placeholder.
We plan use new smu ip block from Vega20.

Signed-off-by: default avatarHuang Rui <ray.huang@amd.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 6c55033a

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+4 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ 
#include "amdgpu_gem.h"

#include "amdgpu_doorbell.h"

#include "amdgpu_amdkfd.h"

#include "amdgpu_smu.h"



#define MAX_GPU_INSTANCE		16
@@ -842,6 +843,9 @@ struct amdgpu_device { 
	struct amd_powerplay		powerplay;

	bool				pp_force_state_enabled;



	/* smu */

	struct smu_context		smu;



	/* dpm */

	struct amdgpu_pm		pm;

	u32				cg_flags;

drivers/gpu/drm/amd/powerplay/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ AMD_POWERPLAY = $(addsuffix /Makefile,$(addprefix $(FULL_AMD_PATH)/powerplay/,$( 


include $(AMD_POWERPLAY)



POWER_MGR = amd_powerplay.o

POWER_MGR = amd_powerplay.o amdgpu_smu.o



AMD_PP_POWER = $(addprefix $(AMD_PP_PATH)/,$(POWER_MGR))

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

0 → 100644
+166 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2019 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 "pp_debug.h"

#include <linux/firmware.h>

#include <drm/drmP.h>

#include "amdgpu.h"

#include "amdgpu_smu.h"

#include "soc15_common.h"



static int smu_set_funcs(struct amdgpu_device *adev)

{

	return 0;

}



static int smu_early_init(void *handle)

{

	struct amdgpu_device *adev = (struct amdgpu_device *)handle;

	struct smu_context *smu = &adev->smu;

	int ret;



	ret = smu_set_funcs(adev);

	if (ret)

		return ret;



	smu->adev = adev;

	mutex_init(&smu->mutex);



	return 0;

}



static int smu_sw_init(void *handle)

{

	struct amdgpu_device *adev = (struct amdgpu_device *)handle;

	struct smu_context *smu = &adev->smu;

	int ret;



	if (adev->asic_type < CHIP_VEGA20)

		return -EINVAL;



	ret = smu_init_microcode(smu);

	if (ret) {

		pr_err("Failed to load smu firmware!\n");

		return ret;

	}



	return 0;

}



static int smu_sw_fini(void *handle)

{

	struct amdgpu_device *adev = (struct amdgpu_device *)handle;



	if (adev->asic_type < CHIP_VEGA20)

		return -EINVAL;



	return 0;

}



static int smu_hw_init(void *handle)

{

	int ret;

	struct amdgpu_device *adev = (struct amdgpu_device *)handle;

	struct smu_context *smu = &adev->smu;



	if (adev->asic_type < CHIP_VEGA20)

		return -EINVAL;



	mutex_lock(&smu->mutex);



	/* TODO */



	mutex_unlock(&smu->mutex);



	pr_info("SMU is initialized successfully!\n");



	return 0;

}



static int smu_hw_fini(void *handle)

{

	struct amdgpu_device *adev = (struct amdgpu_device *)handle;

	struct smu_context *smu = &adev->smu;



	if (adev->asic_type < CHIP_VEGA20)

		return -EINVAL;



	return 0;

}



static int smu_suspend(void *handle)

{

	struct amdgpu_device *adev = (struct amdgpu_device *)handle;



	if (adev->asic_type < CHIP_VEGA20)

		return -EINVAL;



	return 0;

}



static int smu_resume(void *handle)

{

	int ret;

	struct amdgpu_device *adev = (struct amdgpu_device *)handle;

	struct smu_context *smu = &adev->smu;



	if (adev->asic_type < CHIP_VEGA20)

		return -EINVAL;



	mutex_lock(&smu->mutex);



	/* TODO */



	mutex_unlock(&smu->mutex);



	return 0;

}



static int smu_set_clockgating_state(void *handle,

				     enum amd_clockgating_state state)

{

	return 0;

}



static int smu_set_powergating_state(void *handle,

				     enum amd_powergating_state state)

{

	return 0;

}



const struct amd_ip_funcs smu_ip_funcs = {

	.name = "smu",

	.early_init = smu_early_init,

	.late_init = NULL,

	.sw_init = smu_sw_init,

	.sw_fini = smu_sw_fini,

	.hw_init = smu_hw_init,

	.hw_fini = smu_hw_fini,

	.suspend = smu_suspend,

	.resume = smu_resume,

	.is_idle = NULL,

	.check_soft_reset = NULL,

	.wait_for_idle = NULL,

	.soft_reset = NULL,

	.set_clockgating_state = smu_set_clockgating_state,

	.set_powergating_state = smu_set_powergating_state,

};

drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h

0 → 100644
+45 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2019 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.

 */

#ifndef __AMDGPU_SMU_H__

#define __AMDGPU_SMU_H__



#include "amdgpu.h"



struct smu_context

{

	struct amdgpu_device            *adev;



	const struct smu_funcs		*funcs;

	struct mutex			mutex;

};



struct smu_funcs

{

	int (*init_microcode)(struct smu_context *smu);

};



#define smu_init_microcode(smu) \

	((smu)->funcs->init_microcode ? (smu)->funcs->init_microcode((smu)) : 0)



extern const struct amd_ip_funcs smu_ip_funcs;



#endif