mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-08-05 16:54:27 +00:00
drm/amdgpu: Remove redundant calls of ras_late_init in mmhub ras block
Remove redundant calls of ras_late_init in mmhub ras block. Signed-off-by: yipechai <YiPeng.Chai@amd.com> Reviewed-by: Tao Zhou <tao.zhou1@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
parent
72b3588e27
commit
068001b711
4 changed files with 2 additions and 8 deletions
|
@ -458,7 +458,7 @@ int amdgpu_gmc_ras_late_init(struct amdgpu_device *adev)
|
|||
}
|
||||
|
||||
if (adev->mmhub.ras && adev->mmhub.ras->ras_block.ras_late_init) {
|
||||
r = adev->mmhub.ras->ras_block.ras_late_init(adev, NULL);
|
||||
r = adev->mmhub.ras->ras_block.ras_late_init(adev, adev->mmhub.ras_if);
|
||||
if (r)
|
||||
return r;
|
||||
}
|
||||
|
|
|
@ -24,11 +24,6 @@
|
|||
#include "amdgpu.h"
|
||||
#include "amdgpu_ras.h"
|
||||
|
||||
int amdgpu_mmhub_ras_late_init(struct amdgpu_device *adev, struct ras_common_if *ras_block)
|
||||
{
|
||||
return amdgpu_ras_block_late_init(adev, adev->mmhub.ras_if);
|
||||
}
|
||||
|
||||
void amdgpu_mmhub_ras_fini(struct amdgpu_device *adev)
|
||||
{
|
||||
if (amdgpu_ras_is_supported(adev, AMDGPU_RAS_BLOCK__MMHUB) &&
|
||||
|
|
|
@ -47,7 +47,6 @@ struct amdgpu_mmhub {
|
|||
struct amdgpu_mmhub_ras *ras;
|
||||
};
|
||||
|
||||
int amdgpu_mmhub_ras_late_init(struct amdgpu_device *adev, struct ras_common_if *ras_block);
|
||||
void amdgpu_mmhub_ras_fini(struct amdgpu_device *adev);
|
||||
#endif
|
||||
|
||||
|
|
|
@ -1293,7 +1293,7 @@ static void gmc_v9_0_set_mmhub_ras_funcs(struct amdgpu_device *adev)
|
|||
|
||||
/* If don't define special ras_late_init function, use default ras_late_init */
|
||||
if (!adev->mmhub.ras->ras_block.ras_late_init)
|
||||
adev->mmhub.ras->ras_block.ras_late_init = amdgpu_mmhub_ras_late_init;
|
||||
adev->mmhub.ras->ras_block.ras_late_init = amdgpu_ras_block_late_init;
|
||||
|
||||
/* If don't define special ras_fini function, use default ras_fini */
|
||||
if (!adev->mmhub.ras->ras_block.ras_fini)
|
||||
|
|
Loading…
Add table
Reference in a new issue