Commit d65bf1f8 authored by Tao Zhou's avatar Tao Zhou Committed by Alex Deucher

drm/amdgpu: replace mmhub_funcs with mmhub.funcs

remove mmhub_funcs in adev
Signed-off-by: default avatarTao Zhou <tao.zhou1@amd.com>
Reviewed-by: default avatarGuchun Chen <guchun.chen@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent d3a5a121
...@@ -925,7 +925,6 @@ struct amdgpu_device { ...@@ -925,7 +925,6 @@ struct amdgpu_device {
uint32_t *reg_offset[MAX_HWIP][HWIP_MAX_INSTANCE]; uint32_t *reg_offset[MAX_HWIP][HWIP_MAX_INSTANCE];
const struct amdgpu_df_funcs *df_funcs; const struct amdgpu_df_funcs *df_funcs;
const struct amdgpu_mmhub_funcs *mmhub_funcs;
/* delayed work_func for deferring clockgating during resume */ /* delayed work_func for deferring clockgating during resume */
struct delayed_work delayed_init_work; struct delayed_work delayed_init_work;
......
...@@ -687,8 +687,8 @@ int amdgpu_ras_error_query(struct amdgpu_device *adev, ...@@ -687,8 +687,8 @@ int amdgpu_ras_error_query(struct amdgpu_device *adev,
adev->gfx.funcs->query_ras_error_count(adev, &err_data); adev->gfx.funcs->query_ras_error_count(adev, &err_data);
break; break;
case AMDGPU_RAS_BLOCK__MMHUB: case AMDGPU_RAS_BLOCK__MMHUB:
if (adev->mmhub_funcs->query_ras_error_count) if (adev->mmhub.funcs->query_ras_error_count)
adev->mmhub_funcs->query_ras_error_count(adev, &err_data); adev->mmhub.funcs->query_ras_error_count(adev, &err_data);
break; break;
case AMDGPU_RAS_BLOCK__PCIE_BIF: case AMDGPU_RAS_BLOCK__PCIE_BIF:
if (adev->nbio.funcs->query_ras_error_count) if (adev->nbio.funcs->query_ras_error_count)
......
...@@ -655,7 +655,7 @@ static void gmc_v9_0_set_mmhub_funcs(struct amdgpu_device *adev) ...@@ -655,7 +655,7 @@ static void gmc_v9_0_set_mmhub_funcs(struct amdgpu_device *adev)
{ {
switch (adev->asic_type) { switch (adev->asic_type) {
case CHIP_VEGA20: case CHIP_VEGA20:
adev->mmhub_funcs = &mmhub_v1_0_funcs; adev->mmhub.funcs = &mmhub_v1_0_funcs;
break; break;
default: default:
break; break;
...@@ -750,8 +750,8 @@ static int gmc_v9_0_ecc_late_init(void *handle) ...@@ -750,8 +750,8 @@ static int gmc_v9_0_ecc_late_init(void *handle)
return r; return r;
} }
if (adev->mmhub_funcs && adev->mmhub_funcs->ras_late_init) { if (adev->mmhub.funcs && adev->mmhub.funcs->ras_late_init) {
r = adev->mmhub_funcs->ras_late_init(adev); r = adev->mmhub.funcs->ras_late_init(adev);
if (r) if (r)
return r; return r;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment