Commit 7e8a3ca9 authored by Xiaojian Du's avatar Xiaojian Du Committed by Alex Deucher
Browse files

drm/amdgpu: enable support for psp 13.0.4 block 



This patch will enable support for psp 13.0.4 blcok.

Signed-off-by: default avatarXiaojian Du <Xiaojian.Du@amd.com>
Reviewed-by: default avatarTim Huang <Tim.Huang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 2605e60c

drivers/gpu/drm/amd/amdgpu/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -115,7 +115,8 @@ amdgpu-y += \ 
	psp_v11_0.o \

	psp_v11_0_8.o \

	psp_v12_0.o \

	psp_v13_0.o

	psp_v13_0.o \

	psp_v13_0_4.o



# add DCE block

amdgpu-y += \

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

+3 −1
Original line number Diff line number Diff line
@@ -1630,12 +1630,14 @@ static int amdgpu_discovery_set_psp_ip_blocks(struct amdgpu_device *adev) 
	case IP_VERSION(13, 0, 1):

	case IP_VERSION(13, 0, 2):

	case IP_VERSION(13, 0, 3):

	case IP_VERSION(13, 0, 4):

	case IP_VERSION(13, 0, 5):

	case IP_VERSION(13, 0, 7):

	case IP_VERSION(13, 0, 8):

		amdgpu_device_ip_block_add(adev, &psp_v13_0_ip_block);

		break;

	case IP_VERSION(13, 0, 4):

		amdgpu_device_ip_block_add(adev, &psp_v13_0_4_ip_block);

		break;

	default:

		dev_err(adev->dev,

			"Failed to add psp ip block(MP0_HWIP:0x%x)\n",

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

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

#include "psp_v12_0.h"

#include "psp_v13_0.h"

#include "psp_v13_0_4.h"



#include "amdgpu_ras.h"

#include "amdgpu_securedisplay.h"
@@ -151,6 +152,10 @@ static int psp_early_init(void *handle) 
		psp_v13_0_set_psp_funcs(psp);

		psp->autoload_supported = true;

		break;

	case IP_VERSION(13, 0, 4):

		psp_v13_0_4_set_psp_funcs(psp);

		psp->autoload_supported = true;

		break;

	default:

		return -EINVAL;

	}
@@ -3694,3 +3699,11 @@ const struct amdgpu_ip_block_version psp_v13_0_ip_block = { 
	.rev = 0,

	.funcs = &psp_ip_funcs,

};



const struct amdgpu_ip_block_version psp_v13_0_4_ip_block = {

	.type = AMD_IP_BLOCK_TYPE_PSP,

	.major = 13,

	.minor = 0,

	.rev = 4,

	.funcs = &psp_ip_funcs,

};

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

+1 −0
Original line number Diff line number Diff line
@@ -439,6 +439,7 @@ extern const struct amdgpu_ip_block_version psp_v11_0_ip_block; 
extern const struct amdgpu_ip_block_version psp_v11_0_8_ip_block;

extern const struct amdgpu_ip_block_version psp_v12_0_ip_block;

extern const struct amdgpu_ip_block_version psp_v13_0_ip_block;

extern const struct amdgpu_ip_block_version psp_v13_0_4_ip_block;



extern int psp_wait_for(struct psp_context *psp, uint32_t reg_index,

			uint32_t field_val, uint32_t mask, bool check_changed);