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: Mario Limonciello <[email protected]>
Signed-off-by: Pratap Nirujogi <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index 7cb11396e84495b2d266b16fa6d2702ff7de2a78..5e588cc3d0f870766304642494d426e55e8f68b6 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -720,6 +720,7 @@ enum amd_hw_ip_block_type {
        XGMI_HWIP,
        DCI_HWIP,
        PCIE_HWIP,
+       ISP_HWIP,
        MAX_HWIP
 };
 

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
index 7f265163eb1f12dc4a2e4926a6e235275e3bcced..925198225563e689e60a6ee962e3192fd9ecbff4 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
@@ -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)

diff --git a/drivers/gpu/drm/amd/include/amd_shared.h b/drivers/gpu/drm/amd/include/amd_shared.h
index 36ee9d3d6d9c39bcb153a6d30d14de5bdd0f63d1..f5b725f10a7cee3c4b12c08a1b0257b2f45a64b6 100644 (file)
--- a/drivers/gpu/drm/amd/include/amd_shared.h
+++ b/drivers/gpu/drm/amd/include/amd_shared.h
@@ -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,
 };