Commit 89e4c448 authored by YiPeng Chai's avatar YiPeng Chai Committed by Alex Deucher
Browse files

drm/amdgpu: Add gfx ras function on gfx v11_0_3 



Add gfx ras function on gfx v11_0_3.

V2:
 1. Add separate source files for gfx v11_0_3.
 2. Create a common function to initialize gfx ras block.

V3:
 1. Rename amdgpu_gfx_ras_block_init to amdgpu_gfx_ras_sw_init.
 2. Adjust the calling position of amdgpu_gfx_ras_sw_init.
 3. Remove gfx_v11_0_3_ras_ops.

V4:
 Revert changes in amdgpu_ras_interrupt_poison_consumption_handler.

V5:
 1. Remove invalid include file in gfx_v11_0_3.c.
 2. Reduce the number of parameters of amdgpu_gfx_ras_sw_init.

Signed-off-by: default avatarYiPeng Chai <YiPeng.Chai@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: default avatarTao Zhou <tao.zhou1@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 0604897b

drivers/gpu/drm/amd/amdgpu/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -137,6 +137,7 @@ amdgpu-y += \ 
	gfx_v10_0.o \

	imu_v11_0.o \

	gfx_v11_0.o \

	gfx_v11_0_3.o \

	imu_v11_0_3.o



# add async DMA block

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

+35 −0
Original line number Diff line number Diff line
@@ -696,6 +696,41 @@ int amdgpu_gfx_ras_late_init(struct amdgpu_device *adev, struct ras_common_if *r 
	return r;

}



int amdgpu_gfx_ras_sw_init(struct amdgpu_device *adev)

{

	int err = 0;

	struct amdgpu_gfx_ras *ras = NULL;



	/* adev->gfx.ras is NULL, which means gfx does not

	 * support ras function, then do nothing here.

	 */

	if (!adev->gfx.ras)

		return 0;



	ras = adev->gfx.ras;



	err = amdgpu_ras_register_ras_block(adev, &ras->ras_block);

	if (err) {

		dev_err(adev->dev, "Failed to register gfx ras block!\n");

		return err;

	}



	strcpy(ras->ras_block.ras_comm.name, "gfx");

	ras->ras_block.ras_comm.block = AMDGPU_RAS_BLOCK__GFX;

	ras->ras_block.ras_comm.type = AMDGPU_RAS_ERROR__MULTI_UNCORRECTABLE;

	adev->gfx.ras_if = &ras->ras_block.ras_comm;



	/* If not define special ras_late_init function, use gfx default ras_late_init */

	if (!ras->ras_block.ras_late_init)

		ras->ras_block.ras_late_init = amdgpu_ras_block_late_init;



	/* If not defined special ras_cb function, use default ras_cb */

	if (!ras->ras_block.ras_cb)

		ras->ras_block.ras_cb = amdgpu_gfx_process_ras_data_cb;



	return 0;

}



int amdgpu_gfx_process_ras_data_cb(struct amdgpu_device *adev,

		void *err_data,

		struct amdgpu_iv_entry *entry)

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

+1 −0
Original line number Diff line number Diff line
@@ -432,4 +432,5 @@ void amdgpu_kiq_wreg(struct amdgpu_device *adev, uint32_t reg, uint32_t v); 
int amdgpu_gfx_get_num_kcq(struct amdgpu_device *adev);

void amdgpu_gfx_cp_init_microcode(struct amdgpu_device *adev, uint32_t ucode_id);



int amdgpu_gfx_ras_sw_init(struct amdgpu_device *adev);

#endif

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

+13 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ 
#include "clearstate_gfx11.h"

#include "v11_structs.h"

#include "gfx_v11_0.h"

#include "gfx_v11_0_3.h"

#include "nbio_v4_3.h"

#include "mes_v11_0.h"
@@ -815,7 +816,14 @@ static int gfx_v11_0_gpu_early_init(struct amdgpu_device *adev) 
	switch (adev->ip_versions[GC_HWIP][0]) {

	case IP_VERSION(11, 0, 0):

	case IP_VERSION(11, 0, 2):

		adev->gfx.config.max_hw_contexts = 8;

		adev->gfx.config.sc_prim_fifo_size_frontend = 0x20;

		adev->gfx.config.sc_prim_fifo_size_backend = 0x100;

		adev->gfx.config.sc_hiz_tile_fifo_size = 0;

		adev->gfx.config.sc_earlyz_tile_fifo_size = 0x4C0;

		break;

	case IP_VERSION(11, 0, 3):

		adev->gfx.ras = &gfx_v11_0_3_ras;

		adev->gfx.config.max_hw_contexts = 8;

		adev->gfx.config.sc_prim_fifo_size_frontend = 0x20;

		adev->gfx.config.sc_prim_fifo_size_backend = 0x100;
@@ -1380,6 +1388,11 @@ static int gfx_v11_0_sw_init(void *handle) 
	if (r)

		return r;



	if (amdgpu_gfx_ras_sw_init(adev)) {

		dev_err(adev->dev, "Failed to initialize gfx ras block!\n");

		return -EINVAL;

	}



	return 0;

}

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

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

 * Copyright 2023 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"





struct amdgpu_gfx_ras gfx_v11_0_3_ras;