mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-28 20:02:17 +00:00
drm/amd/amdgpu: add sw_fini interface for df_funcs
add sw_fini interface of df_funcs. This interface will remove sysfs file of df_cntr_avail function. The old behavior only create sysfs of df_cntr_avail in sw_init, but never remove it for lack of sw_fini interface. With this,driver will report create sysfs fail when it's loaded for the second time. Signed-off-by: Jack Zhang <Jack.Zhang1@amd.com> Reviewed-by: Jonathan Kim <Jonathan.Kim@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
parent
9dc9134258
commit
f1d59e00ff
4 changed files with 17 additions and 0 deletions
|
@ -651,6 +651,7 @@ struct amdgpu_mmio_remap {
|
|||
|
||||
struct amdgpu_df_funcs {
|
||||
void (*sw_init)(struct amdgpu_device *adev);
|
||||
void (*sw_fini)(struct amdgpu_device *adev);
|
||||
void (*enable_broadcast_mode)(struct amdgpu_device *adev,
|
||||
bool enable);
|
||||
u32 (*get_fb_channel_number)(struct amdgpu_device *adev);
|
||||
|
|
|
@ -33,6 +33,10 @@ static void df_v1_7_sw_init(struct amdgpu_device *adev)
|
|||
{
|
||||
}
|
||||
|
||||
static void df_v1_7_sw_fini(struct amdgpu_device *adev)
|
||||
{
|
||||
}
|
||||
|
||||
static void df_v1_7_enable_broadcast_mode(struct amdgpu_device *adev,
|
||||
bool enable)
|
||||
{
|
||||
|
@ -111,6 +115,7 @@ static void df_v1_7_enable_ecc_force_par_wr_rmw(struct amdgpu_device *adev,
|
|||
|
||||
const struct amdgpu_df_funcs df_v1_7_funcs = {
|
||||
.sw_init = df_v1_7_sw_init,
|
||||
.sw_fini = df_v1_7_sw_fini,
|
||||
.enable_broadcast_mode = df_v1_7_enable_broadcast_mode,
|
||||
.get_fb_channel_number = df_v1_7_get_fb_channel_number,
|
||||
.get_hbm_channel_number = df_v1_7_get_hbm_channel_number,
|
||||
|
|
|
@ -220,6 +220,13 @@ static void df_v3_6_sw_init(struct amdgpu_device *adev)
|
|||
adev->df_perfmon_config_assign_mask[i] = 0;
|
||||
}
|
||||
|
||||
static void df_v3_6_sw_fini(struct amdgpu_device *adev)
|
||||
{
|
||||
|
||||
device_remove_file(adev->dev, &dev_attr_df_cntr_avail);
|
||||
|
||||
}
|
||||
|
||||
static void df_v3_6_enable_broadcast_mode(struct amdgpu_device *adev,
|
||||
bool enable)
|
||||
{
|
||||
|
@ -537,6 +544,7 @@ static void df_v3_6_pmc_get_count(struct amdgpu_device *adev,
|
|||
|
||||
const struct amdgpu_df_funcs df_v3_6_funcs = {
|
||||
.sw_init = df_v3_6_sw_init,
|
||||
.sw_fini = df_v3_6_sw_fini,
|
||||
.enable_broadcast_mode = df_v3_6_enable_broadcast_mode,
|
||||
.get_fb_channel_number = df_v3_6_get_fb_channel_number,
|
||||
.get_hbm_channel_number = df_v3_6_get_hbm_channel_number,
|
||||
|
|
|
@ -1240,6 +1240,9 @@ static int soc15_common_sw_init(void *handle)
|
|||
|
||||
static int soc15_common_sw_fini(void *handle)
|
||||
{
|
||||
struct amdgpu_device *adev = (struct amdgpu_device *)handle;
|
||||
|
||||
adev->df_funcs->sw_fini(adev);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue