Commit 772e4d56 authored by Pratap Nirujogi's avatar Pratap Nirujogi Committed by Alex Deucher
Browse files

drm/amd/amdgpu: Add ISP support to amdgpu_discovery 



ISP hw block is supported in some of the AMD GPU versions, add support
to discover ISP IP in amdgpu_discovery.

v2: squash in documentation update (Alex)

Reviewed-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Signed-off-by: default avatarPratap Nirujogi <pratap.nirujogi@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent d4b8386c

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

+1 −0
Original line number Diff line number Diff line
@@ -720,6 +720,7 @@ enum amd_hw_ip_block_type { 
	XGMI_HWIP,

	DCI_HWIP,

	PCIE_HWIP,

	ISP_HWIP,

	MAX_HWIP

};

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

+1 −0
Original line number Diff line number Diff line
@@ -225,6 +225,7 @@ static int hw_id_map[MAX_HWIP] = { 
	[DCI_HWIP]	= DCI_HWID,

	[PCIE_HWIP]	= PCIE_HWID,

	[VPE_HWIP]	= VPE_HWID,

	[ISP_HWIP]	= ISP_HWID,

};



static int amdgpu_discovery_read_binary_from_sysmem(struct amdgpu_device *adev, uint8_t *binary)

drivers/gpu/drm/amd/include/amd_shared.h

+2 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ enum amd_apu_flags { 
* @AMD_IP_BLOCK_TYPE_JPEG: JPEG Engine

* @AMD_IP_BLOCK_TYPE_VPE: Video Processing Engine

* @AMD_IP_BLOCK_TYPE_UMSCH_MM: User Mode Schduler for Multimedia

* @AMD_IP_BLOCK_TYPE_ISP: Image Signal Processor

* @AMD_IP_BLOCK_TYPE_NUM: Total number of IP block types

*/

enum amd_ip_block_type {
@@ -105,6 +106,7 @@ enum amd_ip_block_type { 
	AMD_IP_BLOCK_TYPE_JPEG,

	AMD_IP_BLOCK_TYPE_VPE,

	AMD_IP_BLOCK_TYPE_UMSCH_MM,

	AMD_IP_BLOCK_TYPE_ISP,

	AMD_IP_BLOCK_TYPE_NUM,

};