Commit b11625f5 authored by Hawking Zhang's avatar Hawking Zhang Committed by Alex Deucher
Browse files

drm/amdgpu: add helpers for hdp ras init/fini 



hdp ras init/fini are common functions that
can be shared among hdp generations

Signed-off-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: default avatarJohn Clements <John.Clements@amd.com>
Reviewed-by: default avatarDennis Li <Dennis.Li@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 8f4a9293

drivers/gpu/drm/amd/amdgpu/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ amdgpu-y += amdgpu_device.o amdgpu_kms.o \ 
	amdgpu_gmc.o amdgpu_mmhub.o amdgpu_xgmi.o amdgpu_csa.o amdgpu_ras.o amdgpu_vm_cpu.o \

	amdgpu_vm_sdma.o amdgpu_discovery.o amdgpu_ras_eeprom.o amdgpu_nbio.o \

	amdgpu_umc.o smu_v11_0_i2c.o amdgpu_fru_eeprom.o amdgpu_rap.o \

	amdgpu_fw_attestation.o amdgpu_securedisplay.o

	amdgpu_fw_attestation.o amdgpu_securedisplay.o amdgpu_hdp.o



amdgpu-$(CONFIG_PERF_EVENTS) += amdgpu_pmu.o

drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.c

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

 * Copyright 2021 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 "amdgpu.h"

#include "amdgpu_ras.h"



int amdgpu_hdp_ras_late_init(struct amdgpu_device *adev)

{

	int r;

	struct ras_ih_if ih_info = {

		.cb = NULL,

	};

	struct ras_fs_if fs_info = {

		.sysfs_name = "hdp_err_count",

	};



	if (!adev->hdp.ras_if) {

		adev->hdp.ras_if = kmalloc(sizeof(struct ras_common_if), GFP_KERNEL);

		if (!adev->hdp.ras_if)

			return -ENOMEM;

		adev->hdp.ras_if->block = AMDGPU_RAS_BLOCK__HDP;

		adev->hdp.ras_if->type = AMDGPU_RAS_ERROR__MULTI_UNCORRECTABLE;

		adev->hdp.ras_if->sub_block_index = 0;

		strcpy(adev->hdp.ras_if->name, "hdp");

	}

	ih_info.head = fs_info.head = *adev->hdp.ras_if;

	r = amdgpu_ras_late_init(adev, adev->hdp.ras_if,

				 &fs_info, &ih_info);

	if (r || !amdgpu_ras_is_supported(adev, adev->hdp.ras_if->block)) {

		kfree(adev->hdp.ras_if);

		adev->hdp.ras_if = NULL;

	}



	return r;

}



void amdgpu_hdp_ras_fini(struct amdgpu_device *adev)

{

	if (amdgpu_ras_is_supported(adev, AMDGPU_RAS_BLOCK__HDP) &&

	    adev->hdp.ras_if) {

		struct ras_common_if *ras_if = adev->hdp.ras_if;

		struct ras_ih_if ih_info = {

			.cb = NULL,

		};



		amdgpu_ras_late_fini(adev, ras_if, &ih_info);

		kfree(ras_if);

	}

}

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

+2 −0
Original line number Diff line number Diff line
@@ -47,4 +47,6 @@ struct amdgpu_hdp { 
	const struct amdgpu_hdp_ras_funcs	*ras_funcs;

};



int amdgpu_hdp_ras_late_init(struct amdgpu_device *adev);

void amdgpu_hdp_ras_fini(struct amdgpu_device *adev);

#endif /* __AMDGPU_HDP_H__ */