drm/amdgpu: increase HWIP MAX INSTANCE
Subsystems (2)
Alex Deucher
maintainerPATCH 1/1 drm/amdgpu: increase HWIP MAX INSTANCE
From: Likun Gao <[email protected]>
Extend HWIP MAX INSTANCE to 11.
Signed-off-by Likun Gao <[email protected]>
Reviewed-by Hawking Zhang <[email protected]>
Signed-off-by Alex Deucher <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +1 -1
@@ -666,7 +666,7 @@ enum amd_hw_ip_block_type { MAX_HWIP }; -#define HWIP_MAX_INSTANCE 10 +#define HWIP_MAX_INSTANCE 11#define HW_ID_MAX 300#define IP_VERSION (mj, mn, rv) (((mj) << 16) | ((mn) << 8) | (rv))
Signature · 1 line
2.35.1
Alex Deucher
maintainerPATCH 1/1 drm/amdgpu: add function to decode ip version
From: Likun Gao <[email protected]>
Add function to decode IP version.
Signed-off-by Likun Gao <[email protected]>
Reviewed-by Alex Deucher <[email protected]>
Signed-off-by Alex Deucher <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 3 +++ drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 33 +++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 2 ++ 3 files changed, 38 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +3 -0
@@ -670,6 +670,9 @@ enum amd_hw_ip_block_type {#define HW_ID_MAX 300#define IP_VERSION (mj, mn, rv) (((mj) << 16) | ((mn) << 8) | (rv)) +#define IP_VERSION_MAJ (ver) ((ver) >> 16) +#define IP_VERSION_MIN (ver) (((ver) >> 8) & 0xFF) +#define IP_VERSION_REV (ver) ((ver) & 0xFF)struct amd_powerplay {void *pp_handle;
drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c +33 -0
@@ -760,3 +760,36 @@ int amdgpu_ucode_init_bo(struct amdgpu_device *adev) }return 0 ; } + +void amdgpu_ucode_ip_version_decode (struct amdgpu_device *adev,int block_type,char *ucode_prefix,int len) +{ +int maj, min, rev; +char *ip_name; +uint32_t version = adev->ip_versions[block_type][0 ]; + +switch (block_type) { +case GC_HWIP : + ip_name ="gc" ; +break ; +case SDMA0_HWIP : + ip_name ="sdma" ; +break ; +case MP0_HWIP : + ip_name ="psp" ; +break ; +case MP1_HWIP : + ip_name ="smu" ; +break ; +case UVD_HWIP : + ip_name ="vcn" ; +break ; +default : +BUG (); + } + + maj =IP_VERSION_MAJ (version); + min =IP_VERSION_MIN (version); + rev =IP_VERSION_REV (version); + +snprintf (ucode_prefix, len,"%s_%d_%d_%d" , ip_name, maj, min, rev); +}
drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h +2 -0
@@ -463,4 +463,6 @@ amdgpu_ucode_get_load_type(struct amdgpu_device *adev, int load_type);const char *amdgpu_ucode_name (enum AMDGPU_UCODE_ID ucode_id); +void amdgpu_ucode_ip_version_decode (struct amdgpu_device *adev,int block_type,char *ucode_prefix,int len); +#endif
Signature · 1 line
2.35.1
Am 26.04.22 um 20:25 schrieb Alex Deucher:
Quoted 7 lines
From: Likun Gao <[email protected]>
Extend HWIP MAX INSTANCE to 11.
Signed-off-by Likun Gao <[email protected]>Reviewed-by Hawking Zhang <[email protected]>Signed-off-by Alex Deucher <[email protected]>
Acked-by Christian König <[email protected]>
Quoted 17 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/amd/amdgpu/amdgpu.h +1
-1@@ -666,7 +666,7 @@ enum amd_hw_ip_block_type { MAX_HWIP }; -#define HWIP_MAX_INSTANCE 10 +#define HWIP_MAX_INSTANCE 11#define HW_ID_MAX 300#define IP_VERSION (mj, mn, rv) (((mj) << 16) | ((mn) << 8) | (rv))