drm/amdgpu: rework IP block registration (v2)
Subsystems (2)
PATCH 1/1 drm/amdgpu: rework IP block registration (v2)
This makes it easier to replace specific IP blocks on asics for handling virtual_dce, DAL, etc. and for building IP lists for hw or tables. This also stored the status information in the same structure.
v2: split out spelling fix into a separate patch
add a function to add IPs to the list
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 42 +- drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c | 17 +- drivers/gpu/drm/amd/amdgpu/amdgpu_acp.h | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 12 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 260 ++++---- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 12 +- drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c | 11 +- drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.h | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 6 +- drivers/gpu/drm/amd/amdgpu/ci_dpm.c | 9 + drivers/gpu/drm/amd/amdgpu/cik.c | 817 +++---------------------- drivers/gpu/drm/amd/amdgpu/cik.h | 2 - drivers/gpu/drm/amd/amdgpu/cik_ih.c | 11 +- drivers/gpu/drm/amd/amdgpu/cik_ih.h | 2 +- drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 11 +- drivers/gpu/drm/amd/amdgpu/cik_sdma.h | 2 +- drivers/gpu/drm/amd/amdgpu/cz_dpm.c | 9 + drivers/gpu/drm/amd/amdgpu/cz_ih.c | 10 +- drivers/gpu/drm/amd/amdgpu/cz_ih.h | 2 +- drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 20 +- drivers/gpu/drm/amd/amdgpu/dce_v10_0.h | 4 +- drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 20 +- drivers/gpu/drm/amd/amdgpu/dce_v11_0.h | 3 +- drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 20 +- drivers/gpu/drm/amd/amdgpu/dce_v6_0.h | 3 +- drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 47 +- drivers/gpu/drm/amd/amdgpu/dce_v8_0.h | 6 +- drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 10 +- drivers/gpu/drm/amd/amdgpu/dce_virtual.h | 2 +- drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 11 +- drivers/gpu/drm/amd/amdgpu/gfx_v6_0.h | 2 +- drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 38 +- drivers/gpu/drm/amd/amdgpu/gfx_v7_0.h | 5 +- drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 20 +- drivers/gpu/drm/amd/amdgpu/gfx_v8_0.h | 3 +- drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 10 +- drivers/gpu/drm/amd/amdgpu/gmc_v6_0.h | 2 +- drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 20 +- drivers/gpu/drm/amd/amdgpu/gmc_v7_0.h | 3 +- drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 29 +- drivers/gpu/drm/amd/amdgpu/gmc_v8_0.h | 4 +- drivers/gpu/drm/amd/amdgpu/iceland_ih.c | 10 +- drivers/gpu/drm/amd/amdgpu/iceland_ih.h | 2 +- drivers/gpu/drm/amd/amdgpu/kv_dpm.c | 9 + drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 11 +- drivers/gpu/drm/amd/amdgpu/sdma_v2_4.h | 2 +- drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 20 +- drivers/gpu/drm/amd/amdgpu/sdma_v3_0.h | 3 +- drivers/gpu/drm/amd/amdgpu/si.c | 288 ++------- drivers/gpu/drm/amd/amdgpu/si.h | 2 - drivers/gpu/drm/amd/amdgpu/si_dma.c | 11 +- drivers/gpu/drm/amd/amdgpu/si_dma.h | 2 +- drivers/gpu/drm/amd/amdgpu/si_dpm.c | 8 + drivers/gpu/drm/amd/amdgpu/si_ih.c | 10 +- drivers/gpu/drm/amd/amdgpu/si_ih.h | 2 +- drivers/gpu/drm/amd/amdgpu/tonga_ih.c | 10 +- drivers/gpu/drm/amd/amdgpu/tonga_ih.h | 4 +- drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 11 +- drivers/gpu/drm/amd/amdgpu/uvd_v4_2.h | 2 +- drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 11 +- drivers/gpu/drm/amd/amdgpu/uvd_v5_0.h | 2 +- drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 29 +- drivers/gpu/drm/amd/amdgpu/uvd_v6_0.h | 4 +- drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 11 +- drivers/gpu/drm/amd/amdgpu/vce_v2_0.h | 2 +- drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 29 +- drivers/gpu/drm/amd/amdgpu/vce_v3_0.h | 4 +- drivers/gpu/drm/amd/amdgpu/vi.c | 837 ++++---------------------- drivers/gpu/drm/amd/amdgpu/vi.h | 2 - 69 files changed, 924 insertions(+), 1935 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +25 -17
@@ -195,21 +195,38 @@ int amdgpu_wait_for_idle(struct amdgpu_device *adev,bool amdgpu_is_idle (struct amdgpu_device *adev,enum amd_ip_block_type block_type); +#define AMDGPU_MAX_IP_NUM 16 + +struct amdgpu_ip_block_status { +bool valid; +bool sw; +bool hw; +bool late_initialized; +bool hang; +}; +struct amdgpu_ip_block_version { -enum amd_ip_block_type type; -u32 major; -u32 minor; -u32 rev; +const enum amd_ip_block_type type; +const u32 major; +const u32 minor; +const u32 rev;const struct amd_ip_funcs *funcs; }; +struct amdgpu_ip_block { +struct amdgpu_ip_block_status status; +const struct amdgpu_ip_block_version *version; +}; +int amdgpu_ip_block_version_cmp (struct amdgpu_device *adev,enum amd_ip_block_type type,u32 major,u32 minor); -const struct amdgpu_ip_block_version *amdgpu_get_ip_block ( -struct amdgpu_device *adev, -enum amd_ip_block_type type); +struct amdgpu_ip_block *amdgpu_get_ip_block (struct amdgpu_device *adev, +enum amd_ip_block_type type); + +int amdgpu_ip_block_add (struct amdgpu_device *adev, +const struct amdgpu_ip_block_version *ip_block_version);/* provided by hw blocks that can move/clear data. e.g., gfx or sdma */ struct amdgpu_buffer_funcs {
@@ -1271,14 +1288,6 @@ typedef void (*amdgpu_wreg_t)(struct amdgpu_device*, uint32_t, uint32_t);typedef uint32_t (*amdgpu_block_rreg_t )(struct amdgpu_device *,uint32_t ,uint32_t );typedef void (*amdgpu_block_wreg_t )(struct amdgpu_device *,uint32_t ,uint32_t ,uint32_t ); -struct amdgpu_ip_block_status { -bool valid; -bool sw; -bool hw; -bool late_initialized; -bool hang; -}; -struct amdgpu_device {struct device *dev;struct drm_device *ddev;
@@ -1434,9 +1443,8 @@ struct amdgpu_device {/* GDS */ struct amdgpu_gds gds; -const struct amdgpu_ip_block_version *ip_blocks; +struct amdgpu_ip_block ip_blocks[AMDGPU_MAX_IP_NUM ];int num_ip_blocks; -struct amdgpu_ip_block_status *ip_block_status;struct mutex mn_lock;DECLARE_HASHTABLE (mn_hash,7 );
drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c +13 -4
@@ -265,14 +265,14 @@ static int acp_hw_init(void *handle)struct amdgpu_device *adev = (struct amdgpu_device *)handle; -const struct amdgpu_ip_block_version *ip_version = +const struct amdgpu_ip_block *ip_block =amdgpu_get_ip_block (adev,AMD_IP_BLOCK_TYPE_ACP ); -if (!ip_version) +if (!ip_block)return -EINVAL ; r =amd_acp_hw_init (adev->acp.cgs_device, - ip_version->major, ip_version->minor); + ip_block->version->major, ip_block->version->minor);/* -ENODEV means board uses AZ rather than ACP */ if (r == -ENODEV )return 0 ;
@@ -456,7 +456,7 @@ static int acp_set_powergating_state(void *handle,return 0 ; } -const struct amd_ip_funcs acp_ip_funcs = { +static const struct amd_ip_funcs acp_ip_funcs = { .name ="acp_ip" , .early_init = acp_early_init, .late_init =NULL ,
@@ -472,3 +472,12 @@ const struct amd_ip_funcs acp_ip_funcs = { .set_clockgating_state = acp_set_clockgating_state, .set_powergating_state = acp_set_powergating_state, }; + +const struct amdgpu_ip_block_version acp_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_ACP , + .major =2 , + .minor =2 , + .rev =0 , + .funcs = &acp_ip_funcs, +};
drivers/gpu/drm/amd/amdgpu/amdgpu_acp.h +1 -1
@@ -37,6 +37,6 @@ struct amdgpu_acp { struct acp_pm_domain *acp_genpd; }; -extern const struct amd_ip_funcs acp_ip_funcs; +extern const struct amdgpu_ip_block_version acp_ip_block;#endif /* __AMDGPU_ACP_H__ */
drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c +6 -6
@@ -626,11 +626,11 @@ static int amdgpu_cgs_set_clockgating_state(struct cgs_device *cgs_device,int i, r =-1 ;for (i =0 ; i < adev->num_ip_blocks; i++) { -if (!adev->ip_block_status[i].valid) +if (!adev->ip_blocks[i].status.valid)continue ; -if (adev->ip_blocks[i].type == block_type) { - r = adev->ip_blocks[i].funcs->set_clockgating_state ( +if (adev->ip_blocks[i].version->type == block_type) { + r = adev->ip_blocks[i].version->funcs->set_clockgating_state ( (void *)adev, state);break ;
@@ -647,11 +647,11 @@ static int amdgpu_cgs_set_powergating_state(struct cgs_device *cgs_device,int i, r =-1 ;for (i =0 ; i < adev->num_ip_blocks; i++) { -if (!adev->ip_block_status[i].valid) +if (!adev->ip_blocks[i].status.valid)continue ; -if (adev->ip_blocks[i].type == block_type) { - r = adev->ip_blocks[i].funcs->set_powergating_state ( +if (adev->ip_blocks[i].version->type == block_type) { + r = adev->ip_blocks[i].version->funcs->set_powergating_state ( (void *)adev, state);break ;
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +138 -122
479 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +6 -6
@@ -306,10 +306,10 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file }for (i =0 ; i < adev->num_ip_blocks; i++) { -if (adev->ip_blocks[i].type == type && - adev->ip_block_status[i].valid) { - ip.hw_ip_version_major = adev->ip_blocks[i].major; - ip.hw_ip_version_minor = adev->ip_blocks[i].minor; +if (adev->ip_blocks[i].version->type == type && + adev->ip_blocks[i].status.valid) { + ip.hw_ip_version_major = adev->ip_blocks[i].version->major; + ip.hw_ip_version_minor = adev->ip_blocks[i].version->minor; ip.capabilities_flags =0 ; ip.available_rings = ring_mask; ip.ib_start_alignment = ib_start_alignment;
@@ -345,8 +345,8 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file }for (i =0 ; i < adev->num_ip_blocks; i++) -if (adev->ip_blocks[i].type == type && - adev->ip_block_status[i].valid && +if (adev->ip_blocks[i].version->type == type && + adev->ip_blocks[i].status.valid && count <AMDGPU_HW_IP_INSTANCE_MAX_COUNT ) count++;
drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c +10 -1
@@ -299,7 +299,7 @@ static int amdgpu_pp_soft_reset(void *handle)return ret; } -const struct amd_ip_funcs amdgpu_pp_ip_funcs = { +static const struct amd_ip_funcs amdgpu_pp_ip_funcs = { .name ="amdgpu_powerplay" , .early_init = amdgpu_pp_early_init, .late_init = amdgpu_pp_late_init,
@@ -316,3 +316,12 @@ const struct amd_ip_funcs amdgpu_pp_ip_funcs = { .set_clockgating_state = amdgpu_pp_set_clockgating_state, .set_powergating_state = amdgpu_pp_set_powergating_state, }; + +const struct amdgpu_ip_block_version amdgpu_pp_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_SMC , + .major =1 , + .minor =0 , + .rev =0 , + .funcs = &amdgpu_pp_ip_funcs, +};
drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.h +1 -1
@@ -28,6 +28,6 @@#include "amd_shared.h" -extern const struct amd_ip_funcs amdgpu_pp_ip_funcs; +extern const struct amdgpu_ip_block_version amdgpu_pp_ip_block;#endif /* __AMDGPU_POWERPLAY_H__ */
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +3 -3
@@ -346,7 +346,7 @@ error:static bool amdgpu_vm_ring_has_compute_vm_bug (struct amdgpu_ring *ring) {struct amdgpu_device *adev = ring->adev; -const struct amdgpu_ip_block_version *ip_block; +const struct amdgpu_ip_block *ip_block;if (ring->funcs->type !=AMDGPU_RING_TYPE_COMPUTE )/* only compute rings */
@@ -356,10 +356,10 @@ static bool amdgpu_vm_ring_has_compute_vm_bug(struct amdgpu_ring *ring)if (!ip_block)return false; -if (ip_block->major <=7 ) { +if (ip_block->version->major <=7 ) {/* gfx7 has no workaround */ return true; - }else if (ip_block->major ==8 ) { + }else if (ip_block->version->major ==8 ) {if (adev->gfx.mec_fw_version >=673 )/* gfx8 is fixed in MEC firmware 673 */ return false;
drivers/gpu/drm/amd/amdgpu/ci_dpm.c +9 -0
@@ -6663,3 +6663,12 @@ static void ci_dpm_set_irq_funcs(struct amdgpu_device *adev) adev->pm.dpm.thermal.irq.num_types =AMDGPU_THERMAL_IRQ_LAST ; adev->pm.dpm.thermal.irq.funcs = &ci_dpm_irq_funcs; } + +const struct amdgpu_ip_block_version ci_dpm_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_SMC , + .major =7 , + .minor =0 , + .rev =0 , + .funcs = &ci_dpm_ip_funcs, +};
drivers/gpu/drm/amd/amdgpu/cik.c +77 -740
832 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/cik.h +0 -2
@@ -24,8 +24,6 @@#ifndef __CIK_H__#define __CIK_H__ -extern const struct amd_ip_funcs cik_common_ip_funcs; -void cik_srbm_select (struct amdgpu_device *adev,u32 me,u32 pipe,u32 queue,u32 vmid);int cik_set_ip_blocks (struct amdgpu_device *adev);
drivers/gpu/drm/amd/amdgpu/cik_ih.c +10 -1
@@ -413,7 +413,7 @@ static int cik_ih_set_powergating_state(void *handle,return 0 ; } -const struct amd_ip_funcs cik_ih_ip_funcs = { +static const struct amd_ip_funcs cik_ih_ip_funcs = { .name ="cik_ih" , .early_init = cik_ih_early_init, .late_init =NULL ,
@@ -441,3 +441,12 @@ static void cik_ih_set_interrupt_funcs(struct amdgpu_device *adev)if (adev->irq.ih_funcs ==NULL ) adev->irq.ih_funcs = &cik_ih_funcs; } + +const struct amdgpu_ip_block_version cik_ih_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_IH , + .major =2 , + .minor =0 , + .rev =0 , + .funcs = &cik_ih_ip_funcs, +};
drivers/gpu/drm/amd/amdgpu/cik_ih.h +1 -1
@@ -24,6 +24,6 @@#ifndef __CIK_IH_H__#define __CIK_IH_H__ -extern const struct amd_ip_funcs cik_ih_ip_funcs; +extern const struct amdgpu_ip_block_version cik_ih_ip_block;#endif
drivers/gpu/drm/amd/amdgpu/cik_sdma.c +10 -1
@@ -1190,7 +1190,7 @@ static int cik_sdma_set_powergating_state(void *handle,return 0 ; } -const struct amd_ip_funcs cik_sdma_ip_funcs = { +static const struct amd_ip_funcs cik_sdma_ip_funcs = { .name ="cik_sdma" , .early_init = cik_sdma_early_init, .late_init =NULL ,
@@ -1342,3 +1342,12 @@ static void cik_sdma_set_vm_pte_funcs(struct amdgpu_device *adev) adev->vm_manager.vm_pte_num_rings = adev->sdma.num_instances; } } + +const struct amdgpu_ip_block_version cik_sdma_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_SDMA , + .major =2 , + .minor =0 , + .rev =0 , + .funcs = &cik_sdma_ip_funcs, +};
drivers/gpu/drm/amd/amdgpu/cik_sdma.h +1 -1
@@ -24,6 +24,6 @@#ifndef __CIK_SDMA_H__#define __CIK_SDMA_H__ -extern const struct amd_ip_funcs cik_sdma_ip_funcs; +extern const struct amdgpu_ip_block_version cik_sdma_ip_block;#endif
drivers/gpu/drm/amd/amdgpu/cz_dpm.c +9 -0
@@ -2296,3 +2296,12 @@ static void cz_dpm_set_funcs(struct amdgpu_device *adev)if (NULL == adev->pm.funcs) adev->pm.funcs = &cz_dpm_funcs; } + +const struct amdgpu_ip_block_version cz_dpm_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_SMC , + .major =8 , + .minor =0 , + .rev =0 , + .funcs = &cz_dpm_ip_funcs, +};
drivers/gpu/drm/amd/amdgpu/cz_ih.c +9 -1
@@ -394,7 +394,7 @@ static int cz_ih_set_powergating_state(void *handle,return 0 ; } -const struct amd_ip_funcs cz_ih_ip_funcs = { +static const struct amd_ip_funcs cz_ih_ip_funcs = { .name ="cz_ih" , .early_init = cz_ih_early_init, .late_init =NULL ,
@@ -423,3 +423,11 @@ static void cz_ih_set_interrupt_funcs(struct amdgpu_device *adev) adev->irq.ih_funcs = &cz_ih_funcs; } +const struct amdgpu_ip_block_version cz_ih_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_IH , + .major =3 , + .minor =0 , + .rev =0 , + .funcs = &cz_ih_ip_funcs, +};
drivers/gpu/drm/amd/amdgpu/cz_ih.h +1 -1
@@ -24,6 +24,6 @@#ifndef __CZ_IH_H__#define __CZ_IH_H__ -extern const struct amd_ip_funcs cz_ih_ip_funcs; +extern const struct amdgpu_ip_block_version cz_ih_ip_block;#endif /* __CZ_IH_H__ */
drivers/gpu/drm/amd/amdgpu/dce_v10_0.c +19 -1
@@ -3470,7 +3470,7 @@ static int dce_v10_0_set_powergating_state(void *handle,return 0 ; } -const struct amd_ip_funcs dce_v10_0_ip_funcs = { +static const struct amd_ip_funcs dce_v10_0_ip_funcs = { .name ="dce_v10_0" , .early_init = dce_v10_0_early_init, .late_init =NULL ,
@@ -3801,3 +3801,21 @@ static void dce_v10_0_set_irq_funcs(struct amdgpu_device *adev) adev->hpd_irq.num_types =AMDGPU_HPD_LAST ; adev->hpd_irq.funcs = &dce_v10_0_hpd_irq_funcs; } + +const struct amdgpu_ip_block_version dce_v10_0_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_DCE , + .major =10 , + .minor =0 , + .rev =0 , + .funcs = &dce_v10_0_ip_funcs, +}; + +const struct amdgpu_ip_block_version dce_v10_1_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_DCE , + .major =10 , + .minor =1 , + .rev =0 , + .funcs = &dce_v10_0_ip_funcs, +};
drivers/gpu/drm/amd/amdgpu/dce_v10_0.h +3 -1
@@ -24,7 +24,9 @@#ifndef __DCE_V10_0_H__#define __DCE_V10_0_H__ -extern const struct amd_ip_funcs dce_v10_0_ip_funcs; + +extern const struct amdgpu_ip_block_version dce_v10_0_ip_block; +extern const struct amdgpu_ip_block_version dce_v10_1_ip_block;void dce_v10_0_disable_dce (struct amdgpu_device *adev);
drivers/gpu/drm/amd/amdgpu/dce_v11_0.c +19 -1
@@ -3527,7 +3527,7 @@ static int dce_v11_0_set_powergating_state(void *handle,return 0 ; } -const struct amd_ip_funcs dce_v11_0_ip_funcs = { +static const struct amd_ip_funcs dce_v11_0_ip_funcs = { .name ="dce_v11_0" , .early_init = dce_v11_0_early_init, .late_init =NULL ,
@@ -3857,3 +3857,21 @@ static void dce_v11_0_set_irq_funcs(struct amdgpu_device *adev) adev->hpd_irq.num_types =AMDGPU_HPD_LAST ; adev->hpd_irq.funcs = &dce_v11_0_hpd_irq_funcs; } + +const struct amdgpu_ip_block_version dce_v11_0_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_DCE , + .major =11 , + .minor =0 , + .rev =0 , + .funcs = &dce_v11_0_ip_funcs, +}; + +const struct amdgpu_ip_block_version dce_v11_2_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_DCE , + .major =11 , + .minor =2 , + .rev =0 , + .funcs = &dce_v11_0_ip_funcs, +};
drivers/gpu/drm/amd/amdgpu/dce_v11_0.h +2 -1
@@ -24,7 +24,8 @@#ifndef __DCE_V11_0_H__#define __DCE_V11_0_H__ -extern const struct amd_ip_funcs dce_v11_0_ip_funcs; +extern const struct amdgpu_ip_block_version dce_v11_0_ip_block; +extern const struct amdgpu_ip_block_version dce_v11_2_ip_block;void dce_v11_0_disable_dce (struct amdgpu_device *adev);
drivers/gpu/drm/amd/amdgpu/dce_v6_0.c +19 -1
@@ -2734,7 +2734,7 @@ static int dce_v6_0_set_powergating_state(void *handle,return 0 ; } -const struct amd_ip_funcs dce_v6_0_ip_funcs = { +static const struct amd_ip_funcs dce_v6_0_ip_funcs = { .name ="dce_v6_0" , .early_init = dce_v6_0_early_init, .late_init =NULL ,
@@ -3075,3 +3075,21 @@ static void dce_v6_0_set_irq_funcs(struct amdgpu_device *adev) adev->hpd_irq.num_types =AMDGPU_HPD_LAST ; adev->hpd_irq.funcs = &dce_v6_0_hpd_irq_funcs; } + +const struct amdgpu_ip_block_version dce_v6_0_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_DCE , + .major =6 , + .minor =0 , + .rev =0 , + .funcs = &dce_v6_0_ip_funcs, +}; + +const struct amdgpu_ip_block_version dce_v6_4_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_DCE , + .major =6 , + .minor =4 , + .rev =0 , + .funcs = &dce_v6_0_ip_funcs, +};
drivers/gpu/drm/amd/amdgpu/dce_v6_0.h +2 -1
@@ -24,7 +24,8 @@#ifndef __DCE_V6_0_H__#define __DCE_V6_0_H__ -extern const struct amd_ip_funcs dce_v6_0_ip_funcs; +extern const struct amdgpu_ip_block_version dce_v6_0_ip_block; +extern const struct amdgpu_ip_block_version dce_v6_4_ip_block;void dce_v6_0_disable_dce (struct amdgpu_device *adev);
drivers/gpu/drm/amd/amdgpu/dce_v8_0.c +46 -1
56 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/dce_v8_0.h +5 -1
@@ -24,7 +24,11 @@#ifndef __DCE_V8_0_H__#define __DCE_V8_0_H__ -extern const struct amd_ip_funcs dce_v8_0_ip_funcs; +extern const struct amdgpu_ip_block_version dce_v8_0_ip_block; +extern const struct amdgpu_ip_block_version dce_v8_1_ip_block; +extern const struct amdgpu_ip_block_version dce_v8_2_ip_block; +extern const struct amdgpu_ip_block_version dce_v8_3_ip_block; +extern const struct amdgpu_ip_block_version dce_v8_5_ip_block;void dce_v8_0_disable_dce (struct amdgpu_device *adev);
drivers/gpu/drm/amd/amdgpu/dce_virtual.c +9 -1
@@ -574,7 +574,7 @@ static int dce_virtual_set_powergating_state(void *handle,return 0 ; } -const struct amd_ip_funcs dce_virtual_ip_funcs = { +static const struct amd_ip_funcs dce_virtual_ip_funcs = { .name ="dce_virtual" , .early_init = dce_virtual_early_init, .late_init =NULL ,
@@ -824,3 +824,11 @@ static void dce_virtual_set_irq_funcs(struct amdgpu_device *adev) adev->crtc_irq.funcs = &dce_virtual_crtc_irq_funcs; } +const struct amdgpu_ip_block_version dce_virtual_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_DCE , + .major =1 , + .minor =0 , + .rev =0 , + .funcs = &dce_virtual_ip_funcs, +};
drivers/gpu/drm/amd/amdgpu/dce_virtual.h +1 -1
@@ -24,7 +24,7 @@#ifndef __DCE_VIRTUAL_H__#define __DCE_VIRTUAL_H__ -extern const struct amd_ip_funcs dce_virtual_ip_funcs; +extern const struct amdgpu_ip_block_version dce_virtual_ip_block;#endif
drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +10 -1
@@ -3206,7 +3206,7 @@ static int gfx_v6_0_set_powergating_state(void *handle,return 0 ; } -const struct amd_ip_funcs gfx_v6_0_ip_funcs = { +static const struct amd_ip_funcs gfx_v6_0_ip_funcs = { .name ="gfx_v6_0" , .early_init = gfx_v6_0_early_init, .late_init =NULL ,
@@ -3344,3 +3344,12 @@ static void gfx_v6_0_get_cu_info(struct amdgpu_device *adev) cu_info->number = active_cu_number; cu_info->ao_cu_mask = ao_cu_mask; } + +const struct amdgpu_ip_block_version gfx_v6_0_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_GFX , + .major =6 , + .minor =0 , + .rev =0 , + .funcs = &gfx_v6_0_ip_funcs, +};
drivers/gpu/drm/amd/amdgpu/gfx_v6_0.h +1 -1
@@ -24,6 +24,6 @@#ifndef __GFX_V6_0_H__#define __GFX_V6_0_H__ -extern const struct amd_ip_funcs gfx_v6_0_ip_funcs; +extern const struct amdgpu_ip_block_version gfx_v6_0_ip_block;#endif
drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c +37 -1
@@ -5087,7 +5087,7 @@ static int gfx_v7_0_set_powergating_state(void *handle,return 0 ; } -const struct amd_ip_funcs gfx_v7_0_ip_funcs = { +static const struct amd_ip_funcs gfx_v7_0_ip_funcs = { .name ="gfx_v7_0" , .early_init = gfx_v7_0_early_init, .late_init = gfx_v7_0_late_init,
@@ -5270,3 +5270,39 @@ static void gfx_v7_0_get_cu_info(struct amdgpu_device *adev) cu_info->number = active_cu_number; cu_info->ao_cu_mask = ao_cu_mask; } + +const struct amdgpu_ip_block_version gfx_v7_0_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_GFX , + .major =7 , + .minor =0 , + .rev =0 , + .funcs = &gfx_v7_0_ip_funcs, +}; + +const struct amdgpu_ip_block_version gfx_v7_1_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_GFX , + .major =7 , + .minor =1 , + .rev =0 , + .funcs = &gfx_v7_0_ip_funcs, +}; + +const struct amdgpu_ip_block_version gfx_v7_2_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_GFX , + .major =7 , + .minor =2 , + .rev =0 , + .funcs = &gfx_v7_0_ip_funcs, +}; + +const struct amdgpu_ip_block_version gfx_v7_3_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_GFX , + .major =7 , + .minor =3 , + .rev =0 , + .funcs = &gfx_v7_0_ip_funcs, +};
drivers/gpu/drm/amd/amdgpu/gfx_v7_0.h +4 -1
@@ -24,6 +24,9 @@#ifndef __GFX_V7_0_H__#define __GFX_V7_0_H__ -extern const struct amd_ip_funcs gfx_v7_0_ip_funcs; +extern const struct amdgpu_ip_block_version gfx_v7_0_ip_block; +extern const struct amdgpu_ip_block_version gfx_v7_1_ip_block; +extern const struct amdgpu_ip_block_version gfx_v7_2_ip_block; +extern const struct amdgpu_ip_block_version gfx_v7_3_ip_block;#endif
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +19 -1
@@ -6504,7 +6504,7 @@ static int gfx_v8_0_priv_inst_irq(struct amdgpu_device *adev,return 0 ; } -const struct amd_ip_funcs gfx_v8_0_ip_funcs = { +static const struct amd_ip_funcs gfx_v8_0_ip_funcs = { .name ="gfx_v8_0" , .early_init = gfx_v8_0_early_init, .late_init = gfx_v8_0_late_init,
@@ -6734,3 +6734,21 @@ static void gfx_v8_0_get_cu_info(struct amdgpu_device *adev) cu_info->number = active_cu_number; cu_info->ao_cu_mask = ao_cu_mask; } + +const struct amdgpu_ip_block_version gfx_v8_0_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_GFX , + .major =8 , + .minor =0 , + .rev =0 , + .funcs = &gfx_v8_0_ip_funcs, +}; + +const struct amdgpu_ip_block_version gfx_v8_1_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_GFX , + .major =8 , + .minor =1 , + .rev =0 , + .funcs = &gfx_v8_0_ip_funcs, +};
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.h +2 -1
@@ -24,6 +24,7 @@#ifndef __GFX_V8_0_H__#define __GFX_V8_0_H__ -extern const struct amd_ip_funcs gfx_v8_0_ip_funcs; +extern const struct amdgpu_ip_block_version gfx_v8_0_ip_block; +extern const struct amdgpu_ip_block_version gfx_v8_1_ip_block;#endif
drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c +9 -1
@@ -1030,7 +1030,7 @@ static int gmc_v6_0_set_powergating_state(void *handle,return 0 ; } -const struct amd_ip_funcs gmc_v6_0_ip_funcs = { +static const struct amd_ip_funcs gmc_v6_0_ip_funcs = { .name ="gmc_v6_0" , .early_init = gmc_v6_0_early_init, .late_init = gmc_v6_0_late_init,
@@ -1069,3 +1069,11 @@ static void gmc_v6_0_set_irq_funcs(struct amdgpu_device *adev) adev->mc.vm_fault.funcs = &gmc_v6_0_irq_funcs; } +const struct amdgpu_ip_block_version gmc_v6_0_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_GMC , + .major =6 , + .minor =0 , + .rev =0 , + .funcs = &gmc_v6_0_ip_funcs, +};
drivers/gpu/drm/amd/amdgpu/gmc_v6_0.h +1 -1
@@ -24,6 +24,6 @@#ifndef __GMC_V6_0_H__#define __GMC_V6_0_H__ -extern const struct amd_ip_funcs gmc_v6_0_ip_funcs; +extern const struct amdgpu_ip_block_version gmc_v6_0_ip_block;#endif
drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +19 -1
@@ -1235,7 +1235,7 @@ static int gmc_v7_0_set_powergating_state(void *handle,return 0 ; } -const struct amd_ip_funcs gmc_v7_0_ip_funcs = { +static const struct amd_ip_funcs gmc_v7_0_ip_funcs = { .name ="gmc_v7_0" , .early_init = gmc_v7_0_early_init, .late_init = gmc_v7_0_late_init,
@@ -1273,3 +1273,21 @@ static void gmc_v7_0_set_irq_funcs(struct amdgpu_device *adev) adev->mc.vm_fault.num_types =1 ; adev->mc.vm_fault.funcs = &gmc_v7_0_irq_funcs; } + +const struct amdgpu_ip_block_version gmc_v7_0_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_GMC , + .major =7 , + .minor =0 , + .rev =0 , + .funcs = &gmc_v7_0_ip_funcs, +}; + +const struct amdgpu_ip_block_version gmc_v7_4_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_GMC , + .major =7 , + .minor =4 , + .rev =0 , + .funcs = &gmc_v7_0_ip_funcs, +};
drivers/gpu/drm/amd/amdgpu/gmc_v7_0.h +2 -1
@@ -24,6 +24,7 @@#ifndef __GMC_V7_0_H__#define __GMC_V7_0_H__ -extern const struct amd_ip_funcs gmc_v7_0_ip_funcs; +extern const struct amdgpu_ip_block_version gmc_v7_0_ip_block; +extern const struct amdgpu_ip_block_version gmc_v7_4_ip_block;#endif
drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +28 -1
@@ -1436,7 +1436,7 @@ static int gmc_v8_0_set_powergating_state(void *handle,return 0 ; } -const struct amd_ip_funcs gmc_v8_0_ip_funcs = { +static const struct amd_ip_funcs gmc_v8_0_ip_funcs = { .name ="gmc_v8_0" , .early_init = gmc_v8_0_early_init, .late_init = gmc_v8_0_late_init,
@@ -1477,3 +1477,30 @@ static void gmc_v8_0_set_irq_funcs(struct amdgpu_device *adev) adev->mc.vm_fault.num_types =1 ; adev->mc.vm_fault.funcs = &gmc_v8_0_irq_funcs; } + +const struct amdgpu_ip_block_version gmc_v8_0_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_GMC , + .major =8 , + .minor =0 , + .rev =0 , + .funcs = &gmc_v8_0_ip_funcs, +}; + +const struct amdgpu_ip_block_version gmc_v8_1_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_GMC , + .major =8 , + .minor =1 , + .rev =0 , + .funcs = &gmc_v8_0_ip_funcs, +}; + +const struct amdgpu_ip_block_version gmc_v8_5_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_GMC , + .major =8 , + .minor =5 , + .rev =0 , + .funcs = &gmc_v8_0_ip_funcs, +};
drivers/gpu/drm/amd/amdgpu/gmc_v8_0.h +3 -1
@@ -24,6 +24,8 @@#ifndef __GMC_V8_0_H__#define __GMC_V8_0_H__ -extern const struct amd_ip_funcs gmc_v8_0_ip_funcs; +extern const struct amdgpu_ip_block_version gmc_v8_0_ip_block; +extern const struct amdgpu_ip_block_version gmc_v8_1_ip_block; +extern const struct amdgpu_ip_block_version gmc_v8_5_ip_block;#endif
drivers/gpu/drm/amd/amdgpu/iceland_ih.c +9 -1
@@ -392,7 +392,7 @@ static int iceland_ih_set_powergating_state(void *handle,return 0 ; } -const struct amd_ip_funcs iceland_ih_ip_funcs = { +static const struct amd_ip_funcs iceland_ih_ip_funcs = { .name ="iceland_ih" , .early_init = iceland_ih_early_init, .late_init =NULL ,
@@ -421,3 +421,11 @@ static void iceland_ih_set_interrupt_funcs(struct amdgpu_device *adev) adev->irq.ih_funcs = &iceland_ih_funcs; } +const struct amdgpu_ip_block_version iceland_ih_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_IH , + .major =2 , + .minor =4 , + .rev =0 , + .funcs = &iceland_ih_ip_funcs, +};
drivers/gpu/drm/amd/amdgpu/iceland_ih.h +1 -1
@@ -24,6 +24,6 @@#ifndef __ICELAND_IH_H__#define __ICELAND_IH_H__ -extern const struct amd_ip_funcs iceland_ih_ip_funcs; +extern const struct amdgpu_ip_block_version iceland_ih_ip_block;#endif /* __ICELAND_IH_H__ */
drivers/gpu/drm/amd/amdgpu/kv_dpm.c +9 -0
@@ -3292,3 +3292,12 @@ static void kv_dpm_set_irq_funcs(struct amdgpu_device *adev) adev->pm.dpm.thermal.irq.num_types =AMDGPU_THERMAL_IRQ_LAST ; adev->pm.dpm.thermal.irq.funcs = &kv_dpm_irq_funcs; } + +const struct amdgpu_ip_block_version kv_dpm_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_SMC , + .major =7 , + .minor =0 , + .rev =0 , + .funcs = &kv_dpm_ip_funcs, +};
drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c +10 -1
@@ -1187,7 +1187,7 @@ static int sdma_v2_4_set_powergating_state(void *handle,return 0 ; } -const struct amd_ip_funcs sdma_v2_4_ip_funcs = { +static const struct amd_ip_funcs sdma_v2_4_ip_funcs = { .name ="sdma_v2_4" , .early_init = sdma_v2_4_early_init, .late_init =NULL ,
@@ -1340,3 +1340,12 @@ static void sdma_v2_4_set_vm_pte_funcs(struct amdgpu_device *adev) adev->vm_manager.vm_pte_num_rings = adev->sdma.num_instances; } } + +const struct amdgpu_ip_block_version sdma_v2_4_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_SDMA , + .major =2 , + .minor =4 , + .rev =0 , + .funcs = &sdma_v2_4_ip_funcs, +};
drivers/gpu/drm/amd/amdgpu/sdma_v2_4.h +1 -1
@@ -24,6 +24,6 @@#ifndef __SDMA_V2_4_H__#define __SDMA_V2_4_H__ -extern const struct amd_ip_funcs sdma_v2_4_ip_funcs; +extern const struct amdgpu_ip_block_version sdma_v2_4_ip_block;#endif
drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c +19 -1
@@ -1527,7 +1527,7 @@ static int sdma_v3_0_set_powergating_state(void *handle,return 0 ; } -const struct amd_ip_funcs sdma_v3_0_ip_funcs = { +static const struct amd_ip_funcs sdma_v3_0_ip_funcs = { .name ="sdma_v3_0" , .early_init = sdma_v3_0_early_init, .late_init =NULL ,
@@ -1683,3 +1683,21 @@ static void sdma_v3_0_set_vm_pte_funcs(struct amdgpu_device *adev) adev->vm_manager.vm_pte_num_rings = adev->sdma.num_instances; } } + +const struct amdgpu_ip_block_version sdma_v3_0_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_SDMA , + .major =3 , + .minor =0 , + .rev =0 , + .funcs = &sdma_v3_0_ip_funcs, +}; + +const struct amdgpu_ip_block_version sdma_v3_1_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_SDMA , + .major =3 , + .minor =1 , + .rev =0 , + .funcs = &sdma_v3_0_ip_funcs, +};
drivers/gpu/drm/amd/amdgpu/sdma_v3_0.h +2 -1
@@ -24,6 +24,7 @@#ifndef __SDMA_V3_0_H__#define __SDMA_V3_0_H__ -extern const struct amd_ip_funcs sdma_v3_0_ip_funcs; +extern const struct amdgpu_ip_block_version sdma_v3_0_ip_block; +extern const struct amdgpu_ip_block_version sdma_v3_1_ip_block;#endif
drivers/gpu/drm/amd/amdgpu/si.c +40 -248
310 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/si.h +0 -2
@@ -24,8 +24,6 @@#ifndef __SI_H__#define __SI_H__ -extern const struct amd_ip_funcs si_common_ip_funcs; -void si_srbm_select (struct amdgpu_device *adev,u32 me,u32 pipe,u32 queue,u32 vmid);int si_set_ip_blocks (struct amdgpu_device *adev);
drivers/gpu/drm/amd/amdgpu/si_dma.c +10 -1
@@ -745,7 +745,7 @@ static int si_dma_set_powergating_state(void *handle,return 0 ; } -const struct amd_ip_funcs si_dma_ip_funcs = { +static const struct amd_ip_funcs si_dma_ip_funcs = { .name ="si_dma" , .early_init = si_dma_early_init, .late_init =NULL ,
@@ -903,3 +903,12 @@ static void si_dma_set_vm_pte_funcs(struct amdgpu_device *adev) adev->vm_manager.vm_pte_num_rings = adev->sdma.num_instances; } } + +const struct amdgpu_ip_block_version si_dma_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_SDMA , + .major =1 , + .minor =0 , + .rev =0 , + .funcs = &si_dma_ip_funcs, +};
drivers/gpu/drm/amd/amdgpu/si_dma.h +1 -1
@@ -24,6 +24,6 @@#ifndef __SI_DMA_H__#define __SI_DMA_H__ -extern const struct amd_ip_funcs si_dma_ip_funcs; +extern const struct amdgpu_ip_block_version si_dma_ip_block;#endif
drivers/gpu/drm/amd/amdgpu/si_dpm.c +8 -0
@@ -8011,3 +8011,11 @@ static void si_dpm_set_irq_funcs(struct amdgpu_device *adev) adev->pm.dpm.thermal.irq.funcs = &si_dpm_irq_funcs; } +const struct amdgpu_ip_block_version si_dpm_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_SMC , + .major =6 , + .minor =0 , + .rev =0 , + .funcs = &si_dpm_ip_funcs, +};
drivers/gpu/drm/amd/amdgpu/si_ih.c +9 -1
@@ -268,7 +268,7 @@ static int si_ih_set_powergating_state(void *handle,return 0 ; } -const struct amd_ip_funcs si_ih_ip_funcs = { +static const struct amd_ip_funcs si_ih_ip_funcs = { .name ="si_ih" , .early_init = si_ih_early_init, .late_init =NULL ,
@@ -297,3 +297,11 @@ static void si_ih_set_interrupt_funcs(struct amdgpu_device *adev) adev->irq.ih_funcs = &si_ih_funcs; } +const struct amdgpu_ip_block_version si_ih_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_IH , + .major =1 , + .minor =0 , + .rev =0 , + .funcs = &si_ih_ip_funcs, +};
drivers/gpu/drm/amd/amdgpu/si_ih.h +1 -1
@@ -24,6 +24,6 @@#ifndef __SI_IH_H__#define __SI_IH_H__ -extern const struct amd_ip_funcs si_ih_ip_funcs; +extern const struct amdgpu_ip_block_version si_ih_ip_block;#endif
drivers/gpu/drm/amd/amdgpu/tonga_ih.c +9 -1
@@ -455,7 +455,7 @@ static int tonga_ih_set_powergating_state(void *handle,return 0 ; } -const struct amd_ip_funcs tonga_ih_ip_funcs = { +static const struct amd_ip_funcs tonga_ih_ip_funcs = { .name ="tonga_ih" , .early_init = tonga_ih_early_init, .late_init =NULL ,
@@ -487,3 +487,11 @@ static void tonga_ih_set_interrupt_funcs(struct amdgpu_device *adev) adev->irq.ih_funcs = &tonga_ih_funcs; } +const struct amdgpu_ip_block_version tonga_ih_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_IH , + .major =3 , + .minor =0 , + .rev =0 , + .funcs = &tonga_ih_ip_funcs, +};
drivers/gpu/drm/amd/amdgpu/tonga_ih.h +2 -2
@@ -24,6 +24,6 @@#ifndef __TONGA_IH_H__#define __TONGA_IH_H__ -extern const struct amd_ip_funcs tonga_ih_ip_funcs; +extern const struct amdgpu_ip_block_version tonga_ih_ip_block; -#endif /* __CZ_IH_H__ */ +#endif /* __TONGA_IH_H__ */
drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c +10 -1
@@ -723,7 +723,7 @@ static int uvd_v4_2_set_powergating_state(void *handle, } } -const struct amd_ip_funcs uvd_v4_2_ip_funcs = { +static const struct amd_ip_funcs uvd_v4_2_ip_funcs = { .name ="uvd_v4_2" , .early_init = uvd_v4_2_early_init, .late_init =NULL ,
@@ -780,3 +780,12 @@ static void uvd_v4_2_set_irq_funcs(struct amdgpu_device *adev) adev->uvd.irq.num_types =1 ; adev->uvd.irq.funcs = &uvd_v4_2_irq_funcs; } + +const struct amdgpu_ip_block_version uvd_v4_2_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_UVD , + .major =4 , + .minor =2 , + .rev =0 , + .funcs = &uvd_v4_2_ip_funcs, +};
drivers/gpu/drm/amd/amdgpu/uvd_v4_2.h +1 -1
@@ -24,6 +24,6 @@#ifndef __UVD_V4_2_H__#define __UVD_V4_2_H__ -extern const struct amd_ip_funcs uvd_v4_2_ip_funcs; +extern const struct amdgpu_ip_block_version uvd_v4_2_ip_block;#endif
drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c +10 -1
@@ -774,7 +774,7 @@ static int uvd_v5_0_set_powergating_state(void *handle, } } -const struct amd_ip_funcs uvd_v5_0_ip_funcs = { +static const struct amd_ip_funcs uvd_v5_0_ip_funcs = { .name ="uvd_v5_0" , .early_init = uvd_v5_0_early_init, .late_init =NULL ,
@@ -831,3 +831,12 @@ static void uvd_v5_0_set_irq_funcs(struct amdgpu_device *adev) adev->uvd.irq.num_types =1 ; adev->uvd.irq.funcs = &uvd_v5_0_irq_funcs; } + +const struct amdgpu_ip_block_version uvd_v5_0_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_UVD , + .major =5 , + .minor =0 , + .rev =0 , + .funcs = &uvd_v5_0_ip_funcs, +};
drivers/gpu/drm/amd/amdgpu/uvd_v5_0.h +1 -1
@@ -24,6 +24,6 @@#ifndef __UVD_V5_0_H__#define __UVD_V5_0_H__ -extern const struct amd_ip_funcs uvd_v5_0_ip_funcs; +extern const struct amdgpu_ip_block_version uvd_v5_0_ip_block;#endif
drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c +28 -1
@@ -1001,7 +1001,7 @@ static int uvd_v6_0_set_powergating_state(void *handle, } } -const struct amd_ip_funcs uvd_v6_0_ip_funcs = { +static const struct amd_ip_funcs uvd_v6_0_ip_funcs = { .name ="uvd_v6_0" , .early_init = uvd_v6_0_early_init, .late_init =NULL ,
@@ -1096,3 +1096,30 @@ static void uvd_v6_0_set_irq_funcs(struct amdgpu_device *adev) adev->uvd.irq.num_types =1 ; adev->uvd.irq.funcs = &uvd_v6_0_irq_funcs; } + +const struct amdgpu_ip_block_version uvd_v6_0_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_UVD , + .major =6 , + .minor =0 , + .rev =0 , + .funcs = &uvd_v6_0_ip_funcs, +}; + +const struct amdgpu_ip_block_version uvd_v6_2_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_UVD , + .major =6 , + .minor =2 , + .rev =0 , + .funcs = &uvd_v6_0_ip_funcs, +}; + +const struct amdgpu_ip_block_version uvd_v6_3_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_UVD , + .major =6 , + .minor =3 , + .rev =0 , + .funcs = &uvd_v6_0_ip_funcs, +};
drivers/gpu/drm/amd/amdgpu/uvd_v6_0.h +3 -1
@@ -24,6 +24,8 @@#ifndef __UVD_V6_0_H__#define __UVD_V6_0_H__ -extern const struct amd_ip_funcs uvd_v6_0_ip_funcs; +extern const struct amdgpu_ip_block_version uvd_v6_0_ip_block; +extern const struct amdgpu_ip_block_version uvd_v6_2_ip_block; +extern const struct amdgpu_ip_block_version uvd_v6_3_ip_block;#endif
drivers/gpu/drm/amd/amdgpu/vce_v2_0.c +10 -1
@@ -592,7 +592,7 @@ static int vce_v2_0_set_powergating_state(void *handle,return vce_v2_0_start (adev); } -const struct amd_ip_funcs vce_v2_0_ip_funcs = { +static const struct amd_ip_funcs vce_v2_0_ip_funcs = { .name ="vce_v2_0" , .early_init = vce_v2_0_early_init, .late_init =NULL ,
@@ -647,3 +647,12 @@ static void vce_v2_0_set_irq_funcs(struct amdgpu_device *adev) adev->vce.irq.num_types =1 ; adev->vce.irq.funcs = &vce_v2_0_irq_funcs; }; + +const struct amdgpu_ip_block_version vce_v2_0_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_VCE , + .major =2 , + .minor =0 , + .rev =0 , + .funcs = &vce_v2_0_ip_funcs, +};
drivers/gpu/drm/amd/amdgpu/vce_v2_0.h +1 -1
@@ -24,6 +24,6 @@#ifndef __VCE_V2_0_H__#define __VCE_V2_0_H__ -extern const struct amd_ip_funcs vce_v2_0_ip_funcs; +extern const struct amdgpu_ip_block_version vce_v2_0_ip_block;#endif
drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +28 -1
@@ -807,7 +807,7 @@ static void vce_v3_0_emit_pipeline_sync(struct amdgpu_ring *ring)amdgpu_ring_write (ring, seq); } -const struct amd_ip_funcs vce_v3_0_ip_funcs = { +static const struct amd_ip_funcs vce_v3_0_ip_funcs = { .name ="vce_v3_0" , .early_init = vce_v3_0_early_init, .late_init =NULL ,
@@ -898,3 +898,30 @@ static void vce_v3_0_set_irq_funcs(struct amdgpu_device *adev) adev->vce.irq.num_types =1 ; adev->vce.irq.funcs = &vce_v3_0_irq_funcs; }; + +const struct amdgpu_ip_block_version vce_v3_0_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_VCE , + .major =3 , + .minor =0 , + .rev =0 , + .funcs = &vce_v3_0_ip_funcs, +}; + +const struct amdgpu_ip_block_version vce_v3_1_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_VCE , + .major =3 , + .minor =1 , + .rev =0 , + .funcs = &vce_v3_0_ip_funcs, +}; + +const struct amdgpu_ip_block_version vce_v3_4_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_VCE , + .major =3 , + .minor =4 , + .rev =0 , + .funcs = &vce_v3_0_ip_funcs, +};
drivers/gpu/drm/amd/amdgpu/vce_v3_0.h +3 -1
@@ -24,6 +24,8 @@#ifndef __VCE_V3_0_H__#define __VCE_V3_0_H__ -extern const struct amd_ip_funcs vce_v3_0_ip_funcs; +extern const struct amdgpu_ip_block_version vce_v3_0_ip_block; +extern const struct amdgpu_ip_block_version vce_v3_1_ip_block; +extern const struct amdgpu_ip_block_version vce_v3_4_ip_block;#endif
drivers/gpu/drm/amd/amdgpu/vi.c +108 -729
238 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 6 lines
2.5.5 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Part of the diff is not shown here. View the raw message.
A message that is not in the archive (sent off-list or not yet received): 1476460103-21677-1-git-send-email-alexander.deucher-5C7GfCeVMHo@public.gmane.org
Christian König
Reviewed-byAm 14.10.2016 um 17:48 schrieb Alex Deucher:
Quoted 9 lines
This makes it easier to replace specific IP blocks on asics for handling
virtual_dce, DAL, etc. and for building IP lists for hw or tables. This also stored the status information in the same structure.v2: split out spelling fix into a separate patch
add a function to add IPs to the listSigned-off-by Alex Deucher <[email protected]>
drivers/gpu/drm/amd/amdgpu/vi.h
Quoted 4,095 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 42 +- drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c | 17 +- drivers/gpu/drm/amd/amdgpu/amdgpu_acp.h | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 12 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 260 ++++---- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 12 +- drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c | 11 +- drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.h | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 6 +- drivers/gpu/drm/amd/amdgpu/ci_dpm.c | 9 + drivers/gpu/drm/amd/amdgpu/cik.c | 817 +++---------------------- drivers/gpu/drm/amd/amdgpu/cik.h | 2 - drivers/gpu/drm/amd/amdgpu/cik_ih.c | 11 +- drivers/gpu/drm/amd/amdgpu/cik_ih.h | 2 +- drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 11 +- drivers/gpu/drm/amd/amdgpu/cik_sdma.h | 2 +- drivers/gpu/drm/amd/amdgpu/cz_dpm.c | 9 + drivers/gpu/drm/amd/amdgpu/cz_ih.c | 10 +- drivers/gpu/drm/amd/amdgpu/cz_ih.h | 2 +- drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 20 +- drivers/gpu/drm/amd/amdgpu/dce_v10_0.h | 4 +- drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 20 +- drivers/gpu/drm/amd/amdgpu/dce_v11_0.h | 3 +- drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 20 +- drivers/gpu/drm/amd/amdgpu/dce_v6_0.h | 3 +- drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 47 +- drivers/gpu/drm/amd/amdgpu/dce_v8_0.h | 6 +- drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 10 +- drivers/gpu/drm/amd/amdgpu/dce_virtual.h | 2 +- drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 11 +- drivers/gpu/drm/amd/amdgpu/gfx_v6_0.h | 2 +- drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 38 +- drivers/gpu/drm/amd/amdgpu/gfx_v7_0.h | 5 +- drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 20 +- drivers/gpu/drm/amd/amdgpu/gfx_v8_0.h | 3 +- drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 10 +- drivers/gpu/drm/amd/amdgpu/gmc_v6_0.h | 2 +- drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 20 +- drivers/gpu/drm/amd/amdgpu/gmc_v7_0.h | 3 +- drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 29 +- drivers/gpu/drm/amd/amdgpu/gmc_v8_0.h | 4 +- drivers/gpu/drm/amd/amdgpu/iceland_ih.c | 10 +- drivers/gpu/drm/amd/amdgpu/iceland_ih.h | 2 +- drivers/gpu/drm/amd/amdgpu/kv_dpm.c | 9 + drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 11 +- drivers/gpu/drm/amd/amdgpu/sdma_v2_4.h | 2 +- drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 20 +- drivers/gpu/drm/amd/amdgpu/sdma_v3_0.h | 3 +- drivers/gpu/drm/amd/amdgpu/si.c | 288 ++------- drivers/gpu/drm/amd/amdgpu/si.h | 2 - drivers/gpu/drm/amd/amdgpu/si_dma.c | 11 +- drivers/gpu/drm/amd/amdgpu/si_dma.h | 2 +- drivers/gpu/drm/amd/amdgpu/si_dpm.c | 8 + drivers/gpu/drm/amd/amdgpu/si_ih.c | 10 +- drivers/gpu/drm/amd/amdgpu/si_ih.h | 2 +- drivers/gpu/drm/amd/amdgpu/tonga_ih.c | 10 +- drivers/gpu/drm/amd/amdgpu/tonga_ih.h | 4 +- drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 11 +- drivers/gpu/drm/amd/amdgpu/uvd_v4_2.h | 2 +- drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 11 +- drivers/gpu/drm/amd/amdgpu/uvd_v5_0.h | 2 +- drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 29 +- drivers/gpu/drm/amd/amdgpu/uvd_v6_0.h | 4 +- drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 11 +- drivers/gpu/drm/amd/amdgpu/vce_v2_0.h | 2 +- drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 29 +- drivers/gpu/drm/amd/amdgpu/vce_v3_0.h | 4 +- drivers/gpu/drm/amd/amdgpu/vi.c | 837 ++++---------------------- drivers/gpu/drm/amd/amdgpu/vi.h | 2 - 69 files changed, 924 insertions(+), 1935 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu.h +25
-17@@ -195,21 +195,38 @@ int amdgpu_wait_for_idle(struct amdgpu_device *adev,bool amdgpu_is_idle (struct amdgpu_device *adev,enum amd_ip_block_type block_type); +#define AMDGPU_MAX_IP_NUM 16 + +struct amdgpu_ip_block_status { +bool valid; +bool sw; +bool hw; +bool late_initialized; +bool hang; +}; +struct amdgpu_ip_block_version { -enum amd_ip_block_type type; -u32 major; -u32 minor; -u32 rev; +const enum amd_ip_block_type type; +const u32 major; +const u32 minor; +const u32 rev;const struct amd_ip_funcs *funcs; }; +struct amdgpu_ip_block { +struct amdgpu_ip_block_status status; +const struct amdgpu_ip_block_version *version; +}; +int amdgpu_ip_block_version_cmp (struct amdgpu_device *adev,enum amd_ip_block_type type,u32 major,u32 minor); -const struct amdgpu_ip_block_version *amdgpu_get_ip_block ( -struct amdgpu_device *adev, -enum amd_ip_block_type type); +struct amdgpu_ip_block *amdgpu_get_ip_block (struct amdgpu_device *adev, +enum amd_ip_block_type type); + +int amdgpu_ip_block_add (struct amdgpu_device *adev, +const struct amdgpu_ip_block_version *ip_block_version);/* provided by hw blocks that can move/clear data. e.g., gfx or sdma */ struct amdgpu_buffer_funcs {@@ -1271,14 +1288,6 @@ typedef void (*amdgpu_wreg_t)(struct amdgpu_device*, uint32_t, uint32_t);typedef uint32_t (*amdgpu_block_rreg_t )(struct amdgpu_device *,uint32_t ,uint32_t );typedef void (*amdgpu_block_wreg_t )(struct amdgpu_device *,uint32_t ,uint32_t ,uint32_t ); -struct amdgpu_ip_block_status { -bool valid; -bool sw; -bool hw; -bool late_initialized; -bool hang; -}; -struct amdgpu_device {struct device *dev;struct drm_device *ddev;@@ -1434,9 +1443,8 @@ struct amdgpu_device {/* GDS */ struct amdgpu_gds gds; -const struct amdgpu_ip_block_version *ip_blocks; +struct amdgpu_ip_block ip_blocks[AMDGPU_MAX_IP_NUM ];int num_ip_blocks; -struct amdgpu_ip_block_status *ip_block_status;struct mutex mn_lock;DECLARE_HASHTABLE (mn_hash,7 );drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c +13
-4@@ -265,14 +265,14 @@ static int acp_hw_init(void *handle)struct amdgpu_device *adev = (struct amdgpu_device *)handle; -const struct amdgpu_ip_block_version *ip_version = +const struct amdgpu_ip_block *ip_block =amdgpu_get_ip_block (adev,AMD_IP_BLOCK_TYPE_ACP ); -if (!ip_version) +if (!ip_block)return -EINVAL ; r =amd_acp_hw_init (adev->acp.cgs_device, - ip_version->major, ip_version->minor); + ip_block->version->major, ip_block->version->minor);/* -ENODEV means board uses AZ rather than ACP */ if (r == -ENODEV )return 0 ;@@ -456,7 +456,7 @@ static int acp_set_powergating_state(void *handle,return 0 ; } -const struct amd_ip_funcs acp_ip_funcs = { +static const struct amd_ip_funcs acp_ip_funcs = { .name ="acp_ip" , .early_init = acp_early_init, .late_init =NULL ,@@ -472,3 +472,12 @@ const struct amd_ip_funcs acp_ip_funcs = { .set_clockgating_state = acp_set_clockgating_state, .set_powergating_state = acp_set_powergating_state, }; + +const struct amdgpu_ip_block_version acp_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_ACP , + .major =2 , + .minor =2 , + .rev =0 , + .funcs = &acp_ip_funcs, +};drivers/gpu/drm/amd/amdgpu/amdgpu_acp.h +1
-1@@ -37,6 +37,6 @@ struct amdgpu_acp { struct acp_pm_domain *acp_genpd; }; -extern const struct amd_ip_funcs acp_ip_funcs; +extern const struct amdgpu_ip_block_version acp_ip_block;#endif /* __AMDGPU_ACP_H__ */ drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c +6
-6@@ -626,11 +626,11 @@ static int amdgpu_cgs_set_clockgating_state(struct cgs_device *cgs_device,int i, r =-1 ;for (i =0 ; i < adev->num_ip_blocks; i++) { -if (!adev->ip_block_status[i].valid) +if (!adev->ip_blocks[i].status.valid)continue ; -if (adev->ip_blocks[i].type == block_type) { - r = adev->ip_blocks[i].funcs->set_clockgating_state ( +if (adev->ip_blocks[i].version->type == block_type) { + r = adev->ip_blocks[i].version->funcs->set_clockgating_state ( (void *)adev, state);break ;@@ -647,11 +647,11 @@ static int amdgpu_cgs_set_powergating_state(struct cgs_device *cgs_device,int i, r =-1 ;for (i =0 ; i < adev->num_ip_blocks; i++) { -if (!adev->ip_block_status[i].valid) +if (!adev->ip_blocks[i].status.valid)continue ; -if (adev->ip_blocks[i].type == block_type) { - r = adev->ip_blocks[i].funcs->set_powergating_state ( +if (adev->ip_blocks[i].version->type == block_type) { + r = adev->ip_blocks[i].version->funcs->set_powergating_state ( (void *)adev, state);break ;drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +138
-122@@ -1133,11 +1133,11 @@ int amdgpu_set_clockgating_state(struct amdgpu_device *adev,int i, r =0 ;for (i =0 ; i < adev->num_ip_blocks; i++) { -if (!adev->ip_block_status[i].valid) +if (!adev->ip_blocks[i].status.valid)continue ; -if (adev->ip_blocks[i].type == block_type) { - r = adev->ip_blocks[i].funcs->set_clockgating_state ((void *)adev, - state); +if (adev->ip_blocks[i].version->type == block_type) { + r = adev->ip_blocks[i].version->funcs->set_clockgating_state ((void *)adev, + state);if (r)return r;break ;@@ -1153,11 +1153,11 @@ int amdgpu_set_powergating_state(struct amdgpu_device *adev,int i, r =0 ;for (i =0 ; i < adev->num_ip_blocks; i++) { -if (!adev->ip_block_status[i].valid) +if (!adev->ip_blocks[i].status.valid)continue ; -if (adev->ip_blocks[i].type == block_type) { - r = adev->ip_blocks[i].funcs->set_powergating_state ((void *)adev, - state); +if (adev->ip_blocks[i].version->type == block_type) { + r = adev->ip_blocks[i].version->funcs->set_powergating_state ((void *)adev, + state);if (r)return r;break ;@@ -1172,10 +1172,10 @@ int amdgpu_wait_for_idle(struct amdgpu_device *adev,int i, r;for (i =0 ; i < adev->num_ip_blocks; i++) { -if (!adev->ip_block_status[i].valid) +if (!adev->ip_blocks[i].status.valid)continue ; -if (adev->ip_blocks[i].type == block_type) { - r = adev->ip_blocks[i].funcs->wait_for_idle ((void *)adev); +if (adev->ip_blocks[i].version->type == block_type) { + r = adev->ip_blocks[i].version->funcs->wait_for_idle ((void *)adev);if (r)return r;break ;@@ -1191,23 +1191,22 @@ bool amdgpu_is_idle(struct amdgpu_device *adev,int i;for (i =0 ; i < adev->num_ip_blocks; i++) { -if (!adev->ip_block_status[i].valid) +if (!adev->ip_blocks[i].status.valid)continue ; -if (adev->ip_blocks[i].type == block_type) -return adev->ip_blocks[i].funcs->is_idle ((void *)adev); +if (adev->ip_blocks[i].version->type == block_type) +return adev->ip_blocks[i].version->funcs->is_idle ((void *)adev); }return true; } -const struct amdgpu_ip_block_version *amdgpu_get_ip_block ( -struct amdgpu_device *adev, -enum amd_ip_block_type type) +struct amdgpu_ip_block *amdgpu_get_ip_block (struct amdgpu_device *adev, +enum amd_ip_block_type type) {int i;for (i =0 ; i < adev->num_ip_blocks; i++) -if (adev->ip_blocks[i].type == type) +if (adev->ip_blocks[i].version->type == type)return &adev->ip_blocks[i];return NULL ;@@ -1228,17 +1227,36 @@ int amdgpu_ip_block_version_cmp(struct amdgpu_device *adev,enum amd_ip_block_type type, u32 major, u32 minor) { - const struct amdgpu_ip_block_version *ip_block; - ip_block =amdgpu_get_ip_block (adev, type); + struct amdgpu_ip_block *ip_block = amdgpu_get_ip_block(adev, type); -if (ip_block && ((ip_block->major > major) || - ((ip_block->major == major) && - (ip_block->minor >= minor)))) +if (ip_block && ((ip_block->version->major > major) || + ((ip_block->version->major == major) && + (ip_block->version->minor >= minor))))return 0 ;return 1 ; } +/** +* amdgpu_ip_block_add +* +* @adev: amdgpu_device pointer +* @ip_block_version: pointer to the IP to add +* +* Adds the IP block driver information to the collection of IPs +* on the asic. +*/ +int amdgpu_ip_block_add (struct amdgpu_device *adev, +const struct amdgpu_ip_block_version *ip_block_version) +{ +if (!ip_block_version) +return -EINVAL ; + + adev->ip_blocks[adev->num_ip_blocks++].version = ip_block_version; + +return 0 ; +} +static void amdgpu_device_enable_virtual_display (struct amdgpu_device *adev) { adev->enable_virtual_display = false;@@ -1339,33 +1357,24 @@ static int amdgpu_early_init(struct amdgpu_device *adev)return -EINVAL ; } - adev->ip_block_status =kcalloc (adev->num_ip_blocks, -sizeof (struct amdgpu_ip_block_status ),GFP_KERNEL ); -if (adev->ip_block_status ==NULL ) -return -ENOMEM ; - -if (adev->ip_blocks ==NULL ) { -DRM_ERROR ("No IP blocks found!\n" ); -return r; - } -for (i =0 ; i < adev->num_ip_blocks; i++) {if ((amdgpu_ip_block_mask & (1 << i)) ==0 ) {DRM_ERROR ("disabled ip block: %d\n" , i); - adev->ip_block_status[i].valid = false; + adev->ip_blocks[i].status.valid = false; }else { -if (adev->ip_blocks[i].funcs->early_init) { - r = adev->ip_blocks[i].funcs->early_init ((void *)adev); +if (adev->ip_blocks[i].version->funcs->early_init) { + r = adev->ip_blocks[i].version->funcs->early_init ((void *)adev);if (r == -ENOENT ) { - adev->ip_block_status[i].valid = false; + adev->ip_blocks[i].status.valid = false; }else if (r) { -DRM_ERROR ("early_init of IP block <%s> failed %d\n" , adev->ip_blocks[i].funcs->name, r); +DRM_ERROR ("early_init of IP block <%s> failed %d\n" , + adev->ip_blocks[i].version->funcs->name, r);return r; }else { - adev->ip_block_status[i].valid = true; + adev->ip_blocks[i].status.valid = true; } }else { - adev->ip_block_status[i].valid = true; + adev->ip_blocks[i].status.valid = true; } } }@@ -1381,22 +1390,23 @@ static int amdgpu_init(struct amdgpu_device *adev)int i, r;for (i =0 ; i < adev->num_ip_blocks; i++) { -if (!adev->ip_block_status[i].valid) +if (!adev->ip_blocks[i].status.valid)continue ; - r = adev->ip_blocks[i].funcs->sw_init ((void *)adev); + r = adev->ip_blocks[i].version->funcs->sw_init ((void *)adev);if (r) { -DRM_ERROR ("sw_init of IP block <%s> failed %d\n" , adev->ip_blocks[i].funcs->name, r); +DRM_ERROR ("sw_init of IP block <%s> failed %d\n" , + adev->ip_blocks[i].version->funcs->name, r);return r; } - adev->ip_block_status[i].sw = true; + adev->ip_blocks[i].status.sw = true;/* need to do gmc hw init early so we can allocate gpu mem */ -if (adev->ip_blocks[i].type ==AMD_IP_BLOCK_TYPE_GMC ) { +if (adev->ip_blocks[i].version->type ==AMD_IP_BLOCK_TYPE_GMC ) { r =amdgpu_vram_scratch_init (adev);if (r) {DRM_ERROR ("amdgpu_vram_scratch_init failed %d\n" , r);return r; } - r = adev->ip_blocks[i].funcs->hw_init ((void *)adev); + r = adev->ip_blocks[i].version->funcs->hw_init ((void *)adev);if (r) {DRM_ERROR ("hw_init %d failed %d\n" , i, r);return r;@@ -1406,22 +1416,23 @@ static int amdgpu_init(struct amdgpu_device *adev)DRM_ERROR ("amdgpu_wb_init failed %d\n" , r);return r; } - adev->ip_block_status[i].hw = true; + adev->ip_blocks[i].status.hw = true; } }for (i =0 ; i < adev->num_ip_blocks; i++) { -if (!adev->ip_block_status[i].sw) +if (!adev->ip_blocks[i].status.sw)continue ;/* gmc hw init is done early */ -if (adev->ip_blocks[i].type ==AMD_IP_BLOCK_TYPE_GMC ) +if (adev->ip_blocks[i].version->type ==AMD_IP_BLOCK_TYPE_GMC )continue ; - r = adev->ip_blocks[i].funcs->hw_init ((void *)adev); + r = adev->ip_blocks[i].version->funcs->hw_init ((void *)adev);if (r) { -DRM_ERROR ("hw_init of IP block <%s> failed %d\n" , adev->ip_blocks[i].funcs->name, r); +DRM_ERROR ("hw_init of IP block <%s> failed %d\n" , + adev->ip_blocks[i].version->funcs->name, r);return r; } - adev->ip_block_status[i].hw = true; + adev->ip_blocks[i].status.hw = true; }return 0 ;@@ -1432,25 +1443,26 @@ static int amdgpu_late_init(struct amdgpu_device *adev)int i =0 , r;for (i =0 ; i < adev->num_ip_blocks; i++) { -if (!adev->ip_block_status[i].valid) +if (!adev->ip_blocks[i].status.valid)continue ; -if (adev->ip_blocks[i].funcs->late_init) { - r = adev->ip_blocks[i].funcs->late_init ((void *)adev); +if (adev->ip_blocks[i].version->funcs->late_init) { + r = adev->ip_blocks[i].version->funcs->late_init ((void *)adev);if (r) { -DRM_ERROR ("late_init of IP block <%s> failed %d\n" , adev->ip_blocks[i].funcs->name, r); +DRM_ERROR ("late_init of IP block <%s> failed %d\n" , + adev->ip_blocks[i].version->funcs->name, r);return r; } - adev->ip_block_status[i].late_initialized = true; + adev->ip_blocks[i].status.late_initialized = true; }/* skip CG for VCE/UVD, it's handled specially */ -if (adev->ip_blocks[i].type !=AMD_IP_BLOCK_TYPE_UVD && - adev->ip_blocks[i].type !=AMD_IP_BLOCK_TYPE_VCE ) { +if (adev->ip_blocks[i].version->type !=AMD_IP_BLOCK_TYPE_UVD && + adev->ip_blocks[i].version->type !=AMD_IP_BLOCK_TYPE_VCE ) {/* enable clockgating to save power */ - r = adev->ip_blocks[i].funcs->set_clockgating_state ((void *)adev, -AMD_CG_STATE_GATE ); + r = adev->ip_blocks[i].version->funcs->set_clockgating_state ((void *)adev, +AMD_CG_STATE_GATE );if (r) {DRM_ERROR ("set_clockgating_state(gate) of IP block <%s> failed %d\n" , - adev->ip_blocks[i].funcs->name, r); + adev->ip_blocks[i].version->funcs->name, r);return r; } }@@ -1465,68 +1477,71 @@ static int amdgpu_fini(struct amdgpu_device *adev)/* need to disable SMC first */ for (i =0 ; i < adev->num_ip_blocks; i++) { -if (!adev->ip_block_status[i].hw) +if (!adev->ip_blocks[i].status.hw)continue ; -if (adev->ip_blocks[i].type ==AMD_IP_BLOCK_TYPE_SMC ) { +if (adev->ip_blocks[i].version->type ==AMD_IP_BLOCK_TYPE_SMC ) {/* ungate blocks before hw fini so that we can shutdown the blocks safely */ - r = adev->ip_blocks[i].funcs->set_clockgating_state ((void *)adev, -AMD_CG_STATE_UNGATE ); + r = adev->ip_blocks[i].version->funcs->set_clockgating_state ((void *)adev, +AMD_CG_STATE_UNGATE );if (r) {DRM_ERROR ("set_clockgating_state(ungate) of IP block <%s> failed %d\n" , - adev->ip_blocks[i].funcs->name, r); + adev->ip_blocks[i].version->funcs->name, r);return r; } - r = adev->ip_blocks[i].funcs->hw_fini ((void *)adev); + r = adev->ip_blocks[i].version->funcs->hw_fini ((void *)adev);/* XXX handle errors */ if (r) {DRM_DEBUG ("hw_fini of IP block <%s> failed %d\n" , - adev->ip_blocks[i].funcs->name, r); + adev->ip_blocks[i].version->funcs->name, r); } - adev->ip_block_status[i].hw = false; + adev->ip_blocks[i].status.hw = false;break ; } }for (i = adev->num_ip_blocks -1 ; i >=0 ; i--) { -if (!adev->ip_block_status[i].hw) +if (!adev->ip_blocks[i].status.hw)continue ; -if (adev->ip_blocks[i].type ==AMD_IP_BLOCK_TYPE_GMC ) { +if (adev->ip_blocks[i].version->type ==AMD_IP_BLOCK_TYPE_GMC ) {amdgpu_wb_fini (adev);amdgpu_vram_scratch_fini (adev); }/* ungate blocks before hw fini so that we can shutdown the blocks safely */ - r = adev->ip_blocks[i].funcs->set_clockgating_state ((void *)adev, -AMD_CG_STATE_UNGATE ); + r = adev->ip_blocks[i].version->funcs->set_clockgating_state ((void *)adev, +AMD_CG_STATE_UNGATE );if (r) { -DRM_ERROR ("set_clockgating_state(ungate) of IP block <%s> failed %d\n" , adev->ip_blocks[i].funcs->name, r); +DRM_ERROR ("set_clockgating_state(ungate) of IP block <%s> failed %d\n" , + adev->ip_blocks[i].version->funcs->name, r);return r; } - r = adev->ip_blocks[i].funcs->hw_fini ((void *)adev); + r = adev->ip_blocks[i].version->funcs->hw_fini ((void *)adev);/* XXX handle errors */ if (r) { -DRM_DEBUG ("hw_fini of IP block <%s> failed %d\n" , adev->ip_blocks[i].funcs->name, r); +DRM_DEBUG ("hw_fini of IP block <%s> failed %d\n" , + adev->ip_blocks[i].version->funcs->name, r); } - adev->ip_block_status[i].hw = false; + adev->ip_blocks[i].status.hw = false; }for (i = adev->num_ip_blocks -1 ; i >=0 ; i--) { -if (!adev->ip_block_status[i].sw) +if (!adev->ip_blocks[i].status.sw)continue ; - r = adev->ip_blocks[i].funcs->sw_fini ((void *)adev); + r = adev->ip_blocks[i].version->funcs->sw_fini ((void *)adev);/* XXX handle errors */ if (r) { -DRM_DEBUG ("sw_fini of IP block <%s> failed %d\n" , adev->ip_blocks[i].funcs->name, r); +DRM_DEBUG ("sw_fini of IP block <%s> failed %d\n" , + adev->ip_blocks[i].version->funcs->name, r); } - adev->ip_block_status[i].sw = false; - adev->ip_block_status[i].valid = false; + adev->ip_blocks[i].status.sw = false; + adev->ip_blocks[i].status.valid = false; }for (i = adev->num_ip_blocks -1 ; i >=0 ; i--) { -if (!adev->ip_block_status[i].late_initialized) +if (!adev->ip_blocks[i].status.late_initialized)continue ; -if (adev->ip_blocks[i].funcs->late_fini) - adev->ip_blocks[i].funcs->late_fini ((void *)adev); - adev->ip_block_status[i].late_initialized = false; +if (adev->ip_blocks[i].version->funcs->late_fini) + adev->ip_blocks[i].version->funcs->late_fini ((void *)adev); + adev->ip_blocks[i].status.late_initialized = false; }return 0 ;@@ -1544,21 +1559,23 @@ static int amdgpu_suspend(struct amdgpu_device *adev) }for (i = adev->num_ip_blocks -1 ; i >=0 ; i--) { -if (!adev->ip_block_status[i].valid) +if (!adev->ip_blocks[i].status.valid)continue ;/* ungate blocks so that suspend can properly shut them down */ if (i !=AMD_IP_BLOCK_TYPE_SMC ) { - r = adev->ip_blocks[i].funcs->set_clockgating_state ((void *)adev, -AMD_CG_STATE_UNGATE ); + r = adev->ip_blocks[i].version->funcs->set_clockgating_state ((void *)adev, +AMD_CG_STATE_UNGATE );if (r) { -DRM_ERROR ("set_clockgating_state(ungate) of IP block <%s> failed %d\n" , adev->ip_blocks[i].funcs->name, r); +DRM_ERROR ("set_clockgating_state(ungate) of IP block <%s> failed %d\n" , + adev->ip_blocks[i].version->funcs->name, r); } }/* XXX handle errors */ - r = adev->ip_blocks[i].funcs->suspend (adev); + r = adev->ip_blocks[i].version->funcs->suspend (adev);/* XXX handle errors */ if (r) { -DRM_ERROR ("suspend of IP block <%s> failed %d\n" , adev->ip_blocks[i].funcs->name, r); +DRM_ERROR ("suspend of IP block <%s> failed %d\n" , + adev->ip_blocks[i].version->funcs->name, r); } }@@ -1570,11 +1587,12 @@ static int amdgpu_resume(struct amdgpu_device *adev)int i, r;for (i =0 ; i < adev->num_ip_blocks; i++) { -if (!adev->ip_block_status[i].valid) +if (!adev->ip_blocks[i].status.valid)continue ; - r = adev->ip_blocks[i].funcs->resume (adev); + r = adev->ip_blocks[i].version->funcs->resume (adev);if (r) { -DRM_ERROR ("resume of IP block <%s> failed %d\n" , adev->ip_blocks[i].funcs->name, r); +DRM_ERROR ("resume of IP block <%s> failed %d\n" , + adev->ip_blocks[i].version->funcs->name, r);return r; } }@@ -1885,8 +1903,6 @@ void amdgpu_device_fini(struct amdgpu_device *adev)drm_crtc_force_disable_all (adev->ddev);amdgpu_fbdev_fini (adev); r =amdgpu_fini (adev); -kfree (adev->ip_block_status); - adev->ip_block_status =NULL ; adev->accel_working = false;/* free i2c buses */ amdgpu_i2c_fini (adev);@@ -2125,13 +2141,13 @@ static bool amdgpu_check_soft_reset(struct amdgpu_device *adev)bool asic_hang = false;for (i =0 ; i < adev->num_ip_blocks; i++) { -if (!adev->ip_block_status[i].valid) +if (!adev->ip_blocks[i].status.valid)continue ; -if (adev->ip_blocks[i].funcs->check_soft_reset) - adev->ip_block_status[i].hang = - adev->ip_blocks[i].funcs->check_soft_reset (adev); -if (adev->ip_block_status[i].hang) { -DRM_INFO ("IP block:%d is hang!\n" , i); +if (adev->ip_blocks[i].version->funcs->check_soft_reset) + adev->ip_blocks[i].status.hang = + adev->ip_blocks[i].version->funcs->check_soft_reset (adev); +if (adev->ip_blocks[i].status.hang) { +DRM_INFO ("IP block:%s is hung!\n" , adev->ip_blocks[i].version->funcs->name); asic_hang = true; } }@@ -2143,11 +2159,11 @@ static int amdgpu_pre_soft_reset(struct amdgpu_device *adev)int i, r =0 ;for (i =0 ; i < adev->num_ip_blocks; i++) { -if (!adev->ip_block_status[i].valid) +if (!adev->ip_blocks[i].status.valid)continue ; -if (adev->ip_block_status[i].hang && - adev->ip_blocks[i].funcs->pre_soft_reset) { - r = adev->ip_blocks[i].funcs->pre_soft_reset (adev); +if (adev->ip_blocks[i].status.hang && + adev->ip_blocks[i].version->funcs->pre_soft_reset) { + r = adev->ip_blocks[i].version->funcs->pre_soft_reset (adev);if (r)return r; }@@ -2161,13 +2177,13 @@ static bool amdgpu_need_full_reset(struct amdgpu_device *adev)int i;for (i =0 ; i < adev->num_ip_blocks; i++) { -if (!adev->ip_block_status[i].valid) +if (!adev->ip_blocks[i].status.valid)continue ; -if ((adev->ip_blocks[i].type ==AMD_IP_BLOCK_TYPE_GMC ) || - (adev->ip_blocks[i].type ==AMD_IP_BLOCK_TYPE_SMC ) || - (adev->ip_blocks[i].type ==AMD_IP_BLOCK_TYPE_ACP ) || - (adev->ip_blocks[i].type ==AMD_IP_BLOCK_TYPE_DCE )) { -if (adev->ip_block_status[i].hang) { +if ((adev->ip_blocks[i].version->type ==AMD_IP_BLOCK_TYPE_GMC ) || + (adev->ip_blocks[i].version->type ==AMD_IP_BLOCK_TYPE_SMC ) || + (adev->ip_blocks[i].version->type ==AMD_IP_BLOCK_TYPE_ACP ) || + (adev->ip_blocks[i].version->type ==AMD_IP_BLOCK_TYPE_DCE )) { +if (adev->ip_blocks[i].status.hang) {DRM_INFO ("Some block need full reset!\n" );return true; }@@ -2181,11 +2197,11 @@ static int amdgpu_soft_reset(struct amdgpu_device *adev)int i, r =0 ;for (i =0 ; i < adev->num_ip_blocks; i++) { -if (!adev->ip_block_status[i].valid) +if (!adev->ip_blocks[i].status.valid)continue ; -if (adev->ip_block_status[i].hang && - adev->ip_blocks[i].funcs->soft_reset) { - r = adev->ip_blocks[i].funcs->soft_reset (adev); +if (adev->ip_blocks[i].status.hang && + adev->ip_blocks[i].version->funcs->soft_reset) { + r = adev->ip_blocks[i].version->funcs->soft_reset (adev);if (r)return r; }@@ -2199,11 +2215,11 @@ static int amdgpu_post_soft_reset(struct amdgpu_device *adev)int i, r =0 ;for (i =0 ; i < adev->num_ip_blocks; i++) { -if (!adev->ip_block_status[i].valid) +if (!adev->ip_blocks[i].status.valid)continue ; -if (adev->ip_block_status[i].hang && - adev->ip_blocks[i].funcs->post_soft_reset) - r = adev->ip_blocks[i].funcs->post_soft_reset (adev); +if (adev->ip_blocks[i].status.hang && + adev->ip_blocks[i].version->funcs->post_soft_reset) + r = adev->ip_blocks[i].version->funcs->post_soft_reset (adev);if (r)return r; }drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +6
-6@@ -306,10 +306,10 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file }for (i =0 ; i < adev->num_ip_blocks; i++) { -if (adev->ip_blocks[i].type == type && - adev->ip_block_status[i].valid) { - ip.hw_ip_version_major = adev->ip_blocks[i].major; - ip.hw_ip_version_minor = adev->ip_blocks[i].minor; +if (adev->ip_blocks[i].version->type == type && + adev->ip_blocks[i].status.valid) { + ip.hw_ip_version_major = adev->ip_blocks[i].version->major; + ip.hw_ip_version_minor = adev->ip_blocks[i].version->minor; ip.capabilities_flags =0 ; ip.available_rings = ring_mask; ip.ib_start_alignment = ib_start_alignment;@@ -345,8 +345,8 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file }for (i =0 ; i < adev->num_ip_blocks; i++) -if (adev->ip_blocks[i].type == type && - adev->ip_block_status[i].valid && +if (adev->ip_blocks[i].version->type == type && + adev->ip_blocks[i].status.valid && count <AMDGPU_HW_IP_INSTANCE_MAX_COUNT ) count++;drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c +10
-1@@ -299,7 +299,7 @@ static int amdgpu_pp_soft_reset(void *handle)return ret; } -const struct amd_ip_funcs amdgpu_pp_ip_funcs = { +static const struct amd_ip_funcs amdgpu_pp_ip_funcs = { .name ="amdgpu_powerplay" , .early_init = amdgpu_pp_early_init, .late_init = amdgpu_pp_late_init,@@ -316,3 +316,12 @@ const struct amd_ip_funcs amdgpu_pp_ip_funcs = { .set_clockgating_state = amdgpu_pp_set_clockgating_state, .set_powergating_state = amdgpu_pp_set_powergating_state, }; + +const struct amdgpu_ip_block_version amdgpu_pp_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_SMC , + .major =1 , + .minor =0 , + .rev =0 , + .funcs = &amdgpu_pp_ip_funcs, +};drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.h +1
-1@@ -28,6 +28,6 @@#include "amd_shared.h" -extern const struct amd_ip_funcs amdgpu_pp_ip_funcs; +extern const struct amdgpu_ip_block_version amdgpu_pp_ip_block;#endif /* __AMDGPU_POWERPLAY_H__ */ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +3
-3@@ -346,7 +346,7 @@ error:static bool amdgpu_vm_ring_has_compute_vm_bug (struct amdgpu_ring *ring) {struct amdgpu_device *adev = ring->adev; -const struct amdgpu_ip_block_version *ip_block; +const struct amdgpu_ip_block *ip_block;if (ring->funcs->type !=AMDGPU_RING_TYPE_COMPUTE )/* only compute rings */ @@ -356,10 +356,10 @@ static bool amdgpu_vm_ring_has_compute_vm_bug(struct amdgpu_ring *ring)if (!ip_block)return false; -if (ip_block->major <=7 ) { +if (ip_block->version->major <=7 ) {/* gfx7 has no workaround */ return true; - }else if (ip_block->major ==8 ) { + }else if (ip_block->version->major ==8 ) {if (adev->gfx.mec_fw_version >=673 )/* gfx8 is fixed in MEC firmware 673 */ return false;drivers/gpu/drm/amd/amdgpu/ci_dpm.c +9
-0@@ -6663,3 +6663,12 @@ static void ci_dpm_set_irq_funcs(struct amdgpu_device *adev) adev->pm.dpm.thermal.irq.num_types =AMDGPU_THERMAL_IRQ_LAST ; adev->pm.dpm.thermal.irq.funcs = &ci_dpm_irq_funcs; } + +const struct amdgpu_ip_block_version ci_dpm_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_SMC , + .major =7 , + .minor =0 , + .rev =0 , + .funcs = &ci_dpm_ip_funcs, +};drivers/gpu/drm/amd/amdgpu/cik.c +77
-740@@ -1641,745 +1641,6 @@ static void cik_detect_hw_virtualization(struct amdgpu_device *adev) adev->virtualization.virtual_caps |=AMDGPU_PASSTHROUGH_MODE ; } -static const struct amdgpu_ip_block_version bonaire_ip_blocks[] = -{ -/* ORDER MATTERS! */ - { - .type =AMD_IP_BLOCK_TYPE_COMMON , - .major =1 , - .minor =0 , - .rev =0 , - .funcs = &cik_common_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_GMC , - .major =7 , - .minor =0 , - .rev =0 , - .funcs = &gmc_v7_0_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_IH , - .major =2 , - .minor =0 , - .rev =0 , - .funcs = &cik_ih_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_SMC , - .major =7 , - .minor =0 , - .rev =0 , - .funcs = &amdgpu_pp_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_DCE , - .major =8 , - .minor =2 , - .rev =0 , - .funcs = &dce_v8_0_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_GFX , - .major =7 , - .minor =2 , - .rev =0 , - .funcs = &gfx_v7_0_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_SDMA , - .major =2 , - .minor =0 , - .rev =0 , - .funcs = &cik_sdma_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_UVD , - .major =4 , - .minor =2 , - .rev =0 , - .funcs = &uvd_v4_2_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_VCE , - .major =2 , - .minor =0 , - .rev =0 , - .funcs = &vce_v2_0_ip_funcs, - }, -}; - -static const struct amdgpu_ip_block_version bonaire_ip_blocks_vd[] = -{ -/* ORDER MATTERS! */ - { - .type =AMD_IP_BLOCK_TYPE_COMMON , - .major =1 , - .minor =0 , - .rev =0 , - .funcs = &cik_common_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_GMC , - .major =7 , - .minor =0 , - .rev =0 , - .funcs = &gmc_v7_0_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_IH , - .major =2 , - .minor =0 , - .rev =0 , - .funcs = &cik_ih_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_SMC , - .major =7 , - .minor =0 , - .rev =0 , - .funcs = &amdgpu_pp_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_DCE , - .major =8 , - .minor =2 , - .rev =0 , - .funcs = &dce_virtual_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_GFX , - .major =7 , - .minor =2 , - .rev =0 , - .funcs = &gfx_v7_0_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_SDMA , - .major =2 , - .minor =0 , - .rev =0 , - .funcs = &cik_sdma_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_UVD , - .major =4 , - .minor =2 , - .rev =0 , - .funcs = &uvd_v4_2_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_VCE , - .major =2 , - .minor =0 , - .rev =0 , - .funcs = &vce_v2_0_ip_funcs, - }, -}; - -static const struct amdgpu_ip_block_version hawaii_ip_blocks[] = -{ -/* ORDER MATTERS! */ - { - .type =AMD_IP_BLOCK_TYPE_COMMON , - .major =1 , - .minor =0 , - .rev =0 , - .funcs = &cik_common_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_GMC , - .major =7 , - .minor =0 , - .rev =0 , - .funcs = &gmc_v7_0_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_IH , - .major =2 , - .minor =0 , - .rev =0 , - .funcs = &cik_ih_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_SMC , - .major =7 , - .minor =0 , - .rev =0 , - .funcs = &amdgpu_pp_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_DCE , - .major =8 , - .minor =5 , - .rev =0 , - .funcs = &dce_v8_0_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_GFX , - .major =7 , - .minor =3 , - .rev =0 , - .funcs = &gfx_v7_0_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_SDMA , - .major =2 , - .minor =0 , - .rev =0 , - .funcs = &cik_sdma_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_UVD , - .major =4 , - .minor =2 , - .rev =0 , - .funcs = &uvd_v4_2_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_VCE , - .major =2 , - .minor =0 , - .rev =0 , - .funcs = &vce_v2_0_ip_funcs, - }, -}; - -static const struct amdgpu_ip_block_version hawaii_ip_blocks_vd[] = -{ -/* ORDER MATTERS! */ - { - .type =AMD_IP_BLOCK_TYPE_COMMON , - .major =1 , - .minor =0 , - .rev =0 , - .funcs = &cik_common_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_GMC , - .major =7 , - .minor =0 , - .rev =0 , - .funcs = &gmc_v7_0_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_IH , - .major =2 , - .minor =0 , - .rev =0 , - .funcs = &cik_ih_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_SMC , - .major =7 , - .minor =0 , - .rev =0 , - .funcs = &amdgpu_pp_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_DCE , - .major =8 , - .minor =5 , - .rev =0 , - .funcs = &dce_virtual_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_GFX , - .major =7 , - .minor =3 , - .rev =0 , - .funcs = &gfx_v7_0_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_SDMA , - .major =2 , - .minor =0 , - .rev =0 , - .funcs = &cik_sdma_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_UVD , - .major =4 , - .minor =2 , - .rev =0 , - .funcs = &uvd_v4_2_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_VCE , - .major =2 , - .minor =0 , - .rev =0 , - .funcs = &vce_v2_0_ip_funcs, - }, -}; - -static const struct amdgpu_ip_block_version kabini_ip_blocks[] = -{ -/* ORDER MATTERS! */ - { - .type =AMD_IP_BLOCK_TYPE_COMMON , - .major =1 , - .minor =0 , - .rev =0 , - .funcs = &cik_common_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_GMC , - .major =7 , - .minor =0 , - .rev =0 , - .funcs = &gmc_v7_0_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_IH , - .major =2 , - .minor =0 , - .rev =0 , - .funcs = &cik_ih_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_SMC , - .major =7 , - .minor =0 , - .rev =0 , - .funcs = &amdgpu_pp_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_DCE , - .major =8 , - .minor =3 , - .rev =0 , - .funcs = &dce_v8_0_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_GFX , - .major =7 , - .minor =2 , - .rev =0 , - .funcs = &gfx_v7_0_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_SDMA , - .major =2 , - .minor =0 , - .rev =0 , - .funcs = &cik_sdma_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_UVD , - .major =4 , - .minor =2 , - .rev =0 , - .funcs = &uvd_v4_2_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_VCE , - .major =2 , - .minor =0 , - .rev =0 , - .funcs = &vce_v2_0_ip_funcs, - }, -}; - -static const struct amdgpu_ip_block_version kabini_ip_blocks_vd[] = -{ -/* ORDER MATTERS! */ - { - .type =AMD_IP_BLOCK_TYPE_COMMON , - .major =1 , - .minor =0 , - .rev =0 , - .funcs = &cik_common_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_GMC , - .major =7 , - .minor =0 , - .rev =0 , - .funcs = &gmc_v7_0_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_IH , - .major =2 , - .minor =0 , - .rev =0 , - .funcs = &cik_ih_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_SMC , - .major =7 , - .minor =0 , - .rev =0 , - .funcs = &amdgpu_pp_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_DCE , - .major =8 , - .minor =3 , - .rev =0 , - .funcs = &dce_virtual_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_GFX , - .major =7 , - .minor =2 , - .rev =0 , - .funcs = &gfx_v7_0_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_SDMA , - .major =2 , - .minor =0 , - .rev =0 , - .funcs = &cik_sdma_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_UVD , - .major =4 , - .minor =2 , - .rev =0 , - .funcs = &uvd_v4_2_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_VCE , - .major =2 , - .minor =0 , - .rev =0 , - .funcs = &vce_v2_0_ip_funcs, - }, -}; - -static const struct amdgpu_ip_block_version mullins_ip_blocks[] = -{ -/* ORDER MATTERS! */ - { - .type =AMD_IP_BLOCK_TYPE_COMMON , - .major =1 , - .minor =0 , - .rev =0 , - .funcs = &cik_common_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_GMC , - .major =7 , - .minor =0 , - .rev =0 , - .funcs = &gmc_v7_0_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_IH , - .major =2 , - .minor =0 , - .rev =0 , - .funcs = &cik_ih_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_SMC , - .major =7 , - .minor =0 , - .rev =0 , - .funcs = &amdgpu_pp_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_DCE , - .major =8 , - .minor =3 , - .rev =0 , - .funcs = &dce_v8_0_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_GFX , - .major =7 , - .minor =2 , - .rev =0 , - .funcs = &gfx_v7_0_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_SDMA , - .major =2 , - .minor =0 , - .rev =0 , - .funcs = &cik_sdma_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_UVD , - .major =4 , - .minor =2 , - .rev =0 , - .funcs = &uvd_v4_2_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_VCE , - .major =2 , - .minor =0 , - .rev =0 , - .funcs = &vce_v2_0_ip_funcs, - }, -}; - -static const struct amdgpu_ip_block_version mullins_ip_blocks_vd[] = -{ -/* ORDER MATTERS! */ - { - .type =AMD_IP_BLOCK_TYPE_COMMON , - .major =1 , - .minor =0 , - .rev =0 , - .funcs = &cik_common_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_GMC , - .major =7 , - .minor =0 , - .rev =0 , - .funcs = &gmc_v7_0_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_IH , - .major =2 , - .minor =0 , - .rev =0 , - .funcs = &cik_ih_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_SMC , - .major =7 , - .minor =0 , - .rev =0 , - .funcs = &amdgpu_pp_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_DCE , - .major =8 , - .minor =3 , - .rev =0 , - .funcs = &dce_virtual_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_GFX , - .major =7 , - .minor =2 , - .rev =0 , - .funcs = &gfx_v7_0_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_SDMA , - .major =2 , - .minor =0 , - .rev =0 , - .funcs = &cik_sdma_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_UVD , - .major =4 , - .minor =2 , - .rev =0 , - .funcs = &uvd_v4_2_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_VCE , - .major =2 , - .minor =0 , - .rev =0 , - .funcs = &vce_v2_0_ip_funcs, - }, -}; - -static const struct amdgpu_ip_block_version kaveri_ip_blocks[] = -{ -/* ORDER MATTERS! */ - { - .type =AMD_IP_BLOCK_TYPE_COMMON , - .major =1 , - .minor =0 , - .rev =0 , - .funcs = &cik_common_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_GMC , - .major =7 , - .minor =0 , - .rev =0 , - .funcs = &gmc_v7_0_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_IH , - .major =2 , - .minor =0 , - .rev =0 , - .funcs = &cik_ih_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_SMC , - .major =7 , - .minor =0 , - .rev =0 , - .funcs = &amdgpu_pp_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_DCE , - .major =8 , - .minor =1 , - .rev =0 , - .funcs = &dce_v8_0_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_GFX , - .major =7 , - .minor =1 , - .rev =0 , - .funcs = &gfx_v7_0_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_SDMA , - .major =2 , - .minor =0 , - .rev =0 , - .funcs = &cik_sdma_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_UVD , - .major =4 , - .minor =2 , - .rev =0 , - .funcs = &uvd_v4_2_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_VCE , - .major =2 , - .minor =0 , - .rev =0 , - .funcs = &vce_v2_0_ip_funcs, - }, -}; - -static const struct amdgpu_ip_block_version kaveri_ip_blocks_vd[] = -{ -/* ORDER MATTERS! */ - { - .type =AMD_IP_BLOCK_TYPE_COMMON , - .major =1 , - .minor =0 , - .rev =0 , - .funcs = &cik_common_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_GMC , - .major =7 , - .minor =0 , - .rev =0 , - .funcs = &gmc_v7_0_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_IH , - .major =2 , - .minor =0 , - .rev =0 , - .funcs = &cik_ih_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_SMC , - .major =7 , - .minor =0 , - .rev =0 , - .funcs = &amdgpu_pp_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_DCE , - .major =8 , - .minor =1 , - .rev =0 , - .funcs = &dce_virtual_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_GFX , - .major =7 , - .minor =1 , - .rev =0 , - .funcs = &gfx_v7_0_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_SDMA , - .major =2 , - .minor =0 , - .rev =0 , - .funcs = &cik_sdma_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_UVD , - .major =4 , - .minor =2 , - .rev =0 , - .funcs = &uvd_v4_2_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_VCE , - .major =2 , - .minor =0 , - .rev =0 , - .funcs = &vce_v2_0_ip_funcs, - }, -}; - -int cik_set_ip_blocks (struct amdgpu_device *adev) -{ -if (adev->enable_virtual_display) { -switch (adev->asic_type) { -case CHIP_BONAIRE : - adev->ip_blocks = bonaire_ip_blocks_vd; - adev->num_ip_blocks =ARRAY_SIZE (bonaire_ip_blocks_vd); -break ; -case CHIP_HAWAII : - adev->ip_blocks = hawaii_ip_blocks_vd; - adev->num_ip_blocks =ARRAY_SIZE (hawaii_ip_blocks_vd); -break ; -case CHIP_KAVERI : - adev->ip_blocks = kaveri_ip_blocks_vd; - adev->num_ip_blocks =ARRAY_SIZE (kaveri_ip_blocks_vd); -break ; -case CHIP_KABINI : - adev->ip_blocks = kabini_ip_blocks_vd; - adev->num_ip_blocks =ARRAY_SIZE (kabini_ip_blocks_vd); -break ; -case CHIP_MULLINS : - adev->ip_blocks = mullins_ip_blocks_vd; - adev->num_ip_blocks =ARRAY_SIZE (mullins_ip_blocks_vd); -break ; -default : -/* FIXME: not supported yet */ -return -EINVAL ; - } - }else { -switch (adev->asic_type) { -case CHIP_BONAIRE : - adev->ip_blocks = bonaire_ip_blocks; - adev->num_ip_blocks =ARRAY_SIZE (bonaire_ip_blocks); -break ; -case CHIP_HAWAII : - adev->ip_blocks = hawaii_ip_blocks; - adev->num_ip_blocks =ARRAY_SIZE (hawaii_ip_blocks); -break ; -case CHIP_KAVERI : - adev->ip_blocks = kaveri_ip_blocks; - adev->num_ip_blocks =ARRAY_SIZE (kaveri_ip_blocks); -break ; -case CHIP_KABINI : - adev->ip_blocks = kabini_ip_blocks; - adev->num_ip_blocks =ARRAY_SIZE (kabini_ip_blocks); -break ; -case CHIP_MULLINS : - adev->ip_blocks = mullins_ip_blocks; - adev->num_ip_blocks =ARRAY_SIZE (mullins_ip_blocks); -break ; -default : -/* FIXME: not supported yet */ -return -EINVAL ; - } - } - -return 0 ; -} -static const struct amdgpu_asic_funcs cik_asic_funcs = { .read_disabled_bios = &cik_read_disabled_bios,@@ -2612,7 +1873,7 @@ static int cik_common_set_powergating_state(void *handle,return 0 ; } -const struct amd_ip_funcs cik_common_ip_funcs = { +static const struct amd_ip_funcs cik_common_ip_funcs = { .name ="cik_common" , .early_init = cik_common_early_init, .late_init =NULL ,@@ -2628,3 +1889,79 @@ const struct amd_ip_funcs cik_common_ip_funcs = { .set_clockgating_state = cik_common_set_clockgating_state, .set_powergating_state = cik_common_set_powergating_state, }; + +static const struct amdgpu_ip_block_version cik_common_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_COMMON , + .major =1 , + .minor =0 , + .rev =0 , + .funcs = &cik_common_ip_funcs, +}; + +int cik_set_ip_blocks (struct amdgpu_device *adev) +{ +switch (adev->asic_type) { +case CHIP_BONAIRE : +amdgpu_ip_block_add (adev, &cik_common_ip_block); +amdgpu_ip_block_add (adev, &gmc_v7_0_ip_block); +amdgpu_ip_block_add (adev, &cik_ih_ip_block); +amdgpu_ip_block_add (adev, &amdgpu_pp_ip_block); +if (adev->enable_virtual_display) +amdgpu_ip_block_add (adev, &dce_virtual_ip_block); +else +amdgpu_ip_block_add (adev, &dce_v8_2_ip_block); +amdgpu_ip_block_add (adev, &gfx_v7_2_ip_block); +amdgpu_ip_block_add (adev, &cik_sdma_ip_block); +amdgpu_ip_block_add (adev, &uvd_v4_2_ip_block); +amdgpu_ip_block_add (adev, &vce_v2_0_ip_block); +break ; +case CHIP_HAWAII : +amdgpu_ip_block_add (adev, &cik_common_ip_block); +amdgpu_ip_block_add (adev, &gmc_v7_0_ip_block); +amdgpu_ip_block_add (adev, &cik_ih_ip_block); +amdgpu_ip_block_add (adev, &amdgpu_pp_ip_block); +if (adev->enable_virtual_display) +amdgpu_ip_block_add (adev, &dce_virtual_ip_block); +else +amdgpu_ip_block_add (adev, &dce_v8_5_ip_block); +amdgpu_ip_block_add (adev, &gfx_v7_3_ip_block); +amdgpu_ip_block_add (adev, &cik_sdma_ip_block); +amdgpu_ip_block_add (adev, &uvd_v4_2_ip_block); +amdgpu_ip_block_add (adev, &vce_v2_0_ip_block); +break ; +case CHIP_KAVERI : +amdgpu_ip_block_add (adev, &cik_common_ip_block); +amdgpu_ip_block_add (adev, &gmc_v7_0_ip_block); +amdgpu_ip_block_add (adev, &cik_ih_ip_block); +amdgpu_ip_block_add (adev, &amdgpu_pp_ip_block); +if (adev->enable_virtual_display) +amdgpu_ip_block_add (adev, &dce_virtual_ip_block); +else +amdgpu_ip_block_add (adev, &dce_v8_1_ip_block); +amdgpu_ip_block_add (adev, &gfx_v7_1_ip_block); +amdgpu_ip_block_add (adev, &cik_sdma_ip_block); +amdgpu_ip_block_add (adev, &uvd_v4_2_ip_block); +amdgpu_ip_block_add (adev, &vce_v2_0_ip_block); +break ; +case CHIP_KABINI : +case CHIP_MULLINS : +amdgpu_ip_block_add (adev, &cik_common_ip_block); +amdgpu_ip_block_add (adev, &gmc_v7_0_ip_block); +amdgpu_ip_block_add (adev, &cik_ih_ip_block); +amdgpu_ip_block_add (adev, &amdgpu_pp_ip_block); +if (adev->enable_virtual_display) +amdgpu_ip_block_add (adev, &dce_virtual_ip_block); +else +amdgpu_ip_block_add (adev, &dce_v8_3_ip_block); +amdgpu_ip_block_add (adev, &gfx_v7_2_ip_block); +amdgpu_ip_block_add (adev, &cik_sdma_ip_block); +amdgpu_ip_block_add (adev, &uvd_v4_2_ip_block); +amdgpu_ip_block_add (adev, &vce_v2_0_ip_block); +break ; +default : +/* FIXME: not supported yet */ +return -EINVAL ; + } +return 0 ; +}drivers/gpu/drm/amd/amdgpu/cik.h +0
-2@@ -24,8 +24,6 @@#ifndef __CIK_H__#define __CIK_H__ -extern const struct amd_ip_funcs cik_common_ip_funcs; -void cik_srbm_select (struct amdgpu_device *adev,u32 me,u32 pipe,u32 queue,u32 vmid);int cik_set_ip_blocks (struct amdgpu_device *adev);drivers/gpu/drm/amd/amdgpu/cik_ih.c +10
-1@@ -413,7 +413,7 @@ static int cik_ih_set_powergating_state(void *handle,return 0 ; } -const struct amd_ip_funcs cik_ih_ip_funcs = { +static const struct amd_ip_funcs cik_ih_ip_funcs = { .name ="cik_ih" , .early_init = cik_ih_early_init, .late_init =NULL ,@@ -441,3 +441,12 @@ static void cik_ih_set_interrupt_funcs(struct amdgpu_device *adev)if (adev->irq.ih_funcs ==NULL ) adev->irq.ih_funcs = &cik_ih_funcs; } + +const struct amdgpu_ip_block_version cik_ih_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_IH , + .major =2 , + .minor =0 , + .rev =0 , + .funcs = &cik_ih_ip_funcs, +};drivers/gpu/drm/amd/amdgpu/cik_ih.h +1
-1@@ -24,6 +24,6 @@#ifndef __CIK_IH_H__#define __CIK_IH_H__ -extern const struct amd_ip_funcs cik_ih_ip_funcs; +extern const struct amdgpu_ip_block_version cik_ih_ip_block;#endif drivers/gpu/drm/amd/amdgpu/cik_sdma.c +10
-1@@ -1190,7 +1190,7 @@ static int cik_sdma_set_powergating_state(void *handle,return 0 ; } -const struct amd_ip_funcs cik_sdma_ip_funcs = { +static const struct amd_ip_funcs cik_sdma_ip_funcs = { .name ="cik_sdma" , .early_init = cik_sdma_early_init, .late_init =NULL ,@@ -1342,3 +1342,12 @@ static void cik_sdma_set_vm_pte_funcs(struct amdgpu_device *adev) adev->vm_manager.vm_pte_num_rings = adev->sdma.num_instances; } } + +const struct amdgpu_ip_block_version cik_sdma_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_SDMA , + .major =2 , + .minor =0 , + .rev =0 , + .funcs = &cik_sdma_ip_funcs, +};drivers/gpu/drm/amd/amdgpu/cik_sdma.h +1
-1@@ -24,6 +24,6 @@#ifndef __CIK_SDMA_H__#define __CIK_SDMA_H__ -extern const struct amd_ip_funcs cik_sdma_ip_funcs; +extern const struct amdgpu_ip_block_version cik_sdma_ip_block;#endif drivers/gpu/drm/amd/amdgpu/cz_dpm.c +9
-0@@ -2296,3 +2296,12 @@ static void cz_dpm_set_funcs(struct amdgpu_device *adev)if (NULL == adev->pm.funcs) adev->pm.funcs = &cz_dpm_funcs; } + +const struct amdgpu_ip_block_version cz_dpm_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_SMC , + .major =8 , + .minor =0 , + .rev =0 , + .funcs = &cz_dpm_ip_funcs, +};drivers/gpu/drm/amd/amdgpu/cz_ih.c +9
-1@@ -394,7 +394,7 @@ static int cz_ih_set_powergating_state(void *handle,return 0 ; } -const struct amd_ip_funcs cz_ih_ip_funcs = { +static const struct amd_ip_funcs cz_ih_ip_funcs = { .name ="cz_ih" , .early_init = cz_ih_early_init, .late_init =NULL ,@@ -423,3 +423,11 @@ static void cz_ih_set_interrupt_funcs(struct amdgpu_device *adev) adev->irq.ih_funcs = &cz_ih_funcs; } +const struct amdgpu_ip_block_version cz_ih_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_IH , + .major =3 , + .minor =0 , + .rev =0 , + .funcs = &cz_ih_ip_funcs, +};drivers/gpu/drm/amd/amdgpu/cz_ih.h +1
-1@@ -24,6 +24,6 @@#ifndef __CZ_IH_H__#define __CZ_IH_H__ -extern const struct amd_ip_funcs cz_ih_ip_funcs; +extern const struct amdgpu_ip_block_version cz_ih_ip_block;#endif /* __CZ_IH_H__ */ drivers/gpu/drm/amd/amdgpu/dce_v10_0.c +19
-1@@ -3470,7 +3470,7 @@ static int dce_v10_0_set_powergating_state(void *handle,return 0 ; } -const struct amd_ip_funcs dce_v10_0_ip_funcs = { +static const struct amd_ip_funcs dce_v10_0_ip_funcs = { .name ="dce_v10_0" , .early_init = dce_v10_0_early_init, .late_init =NULL ,@@ -3801,3 +3801,21 @@ static void dce_v10_0_set_irq_funcs(struct amdgpu_device *adev) adev->hpd_irq.num_types =AMDGPU_HPD_LAST ; adev->hpd_irq.funcs = &dce_v10_0_hpd_irq_funcs; } + +const struct amdgpu_ip_block_version dce_v10_0_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_DCE , + .major =10 , + .minor =0 , + .rev =0 , + .funcs = &dce_v10_0_ip_funcs, +}; + +const struct amdgpu_ip_block_version dce_v10_1_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_DCE , + .major =10 , + .minor =1 , + .rev =0 , + .funcs = &dce_v10_0_ip_funcs, +};drivers/gpu/drm/amd/amdgpu/dce_v10_0.h +3
-1@@ -24,7 +24,9 @@#ifndef __DCE_V10_0_H__#define __DCE_V10_0_H__ -extern const struct amd_ip_funcs dce_v10_0_ip_funcs; + +extern const struct amdgpu_ip_block_version dce_v10_0_ip_block; +extern const struct amdgpu_ip_block_version dce_v10_1_ip_block;void dce_v10_0_disable_dce (struct amdgpu_device *adev);drivers/gpu/drm/amd/amdgpu/dce_v11_0.c +19
-1@@ -3527,7 +3527,7 @@ static int dce_v11_0_set_powergating_state(void *handle,return 0 ; } -const struct amd_ip_funcs dce_v11_0_ip_funcs = { +static const struct amd_ip_funcs dce_v11_0_ip_funcs = { .name ="dce_v11_0" , .early_init = dce_v11_0_early_init, .late_init =NULL ,@@ -3857,3 +3857,21 @@ static void dce_v11_0_set_irq_funcs(struct amdgpu_device *adev) adev->hpd_irq.num_types =AMDGPU_HPD_LAST ; adev->hpd_irq.funcs = &dce_v11_0_hpd_irq_funcs; } + +const struct amdgpu_ip_block_version dce_v11_0_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_DCE , + .major =11 , + .minor =0 , + .rev =0 , + .funcs = &dce_v11_0_ip_funcs, +}; + +const struct amdgpu_ip_block_version dce_v11_2_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_DCE , + .major =11 , + .minor =2 , + .rev =0 , + .funcs = &dce_v11_0_ip_funcs, +};drivers/gpu/drm/amd/amdgpu/dce_v11_0.h +2
-1@@ -24,7 +24,8 @@#ifndef __DCE_V11_0_H__#define __DCE_V11_0_H__ -extern const struct amd_ip_funcs dce_v11_0_ip_funcs; +extern const struct amdgpu_ip_block_version dce_v11_0_ip_block; +extern const struct amdgpu_ip_block_version dce_v11_2_ip_block;void dce_v11_0_disable_dce (struct amdgpu_device *adev);drivers/gpu/drm/amd/amdgpu/dce_v6_0.c +19
-1@@ -2734,7 +2734,7 @@ static int dce_v6_0_set_powergating_state(void *handle,return 0 ; } -const struct amd_ip_funcs dce_v6_0_ip_funcs = { +static const struct amd_ip_funcs dce_v6_0_ip_funcs = { .name ="dce_v6_0" , .early_init = dce_v6_0_early_init, .late_init =NULL ,@@ -3075,3 +3075,21 @@ static void dce_v6_0_set_irq_funcs(struct amdgpu_device *adev) adev->hpd_irq.num_types =AMDGPU_HPD_LAST ; adev->hpd_irq.funcs = &dce_v6_0_hpd_irq_funcs; } + +const struct amdgpu_ip_block_version dce_v6_0_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_DCE , + .major =6 , + .minor =0 , + .rev =0 , + .funcs = &dce_v6_0_ip_funcs, +}; + +const struct amdgpu_ip_block_version dce_v6_4_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_DCE , + .major =6 , + .minor =4 , + .rev =0 , + .funcs = &dce_v6_0_ip_funcs, +};drivers/gpu/drm/amd/amdgpu/dce_v6_0.h +2
-1@@ -24,7 +24,8 @@#ifndef __DCE_V6_0_H__#define __DCE_V6_0_H__ -extern const struct amd_ip_funcs dce_v6_0_ip_funcs; +extern const struct amdgpu_ip_block_version dce_v6_0_ip_block; +extern const struct amdgpu_ip_block_version dce_v6_4_ip_block;void dce_v6_0_disable_dce (struct amdgpu_device *adev);drivers/gpu/drm/amd/amdgpu/dce_v8_0.c +46
-1@@ -3308,7 +3308,7 @@ static int dce_v8_0_set_powergating_state(void *handle,return 0 ; } -const struct amd_ip_funcs dce_v8_0_ip_funcs = { +static const struct amd_ip_funcs dce_v8_0_ip_funcs = { .name ="dce_v8_0" , .early_init = dce_v8_0_early_init, .late_init =NULL ,@@ -3638,3 +3638,48 @@ static void dce_v8_0_set_irq_funcs(struct amdgpu_device *adev) adev->hpd_irq.num_types =AMDGPU_HPD_LAST ; adev->hpd_irq.funcs = &dce_v8_0_hpd_irq_funcs; } + +const struct amdgpu_ip_block_version dce_v8_0_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_DCE , + .major =8 , + .minor =0 , + .rev =0 , + .funcs = &dce_v8_0_ip_funcs, +}; + +const struct amdgpu_ip_block_version dce_v8_1_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_DCE , + .major =8 , + .minor =1 , + .rev =0 , + .funcs = &dce_v8_0_ip_funcs, +}; + +const struct amdgpu_ip_block_version dce_v8_2_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_DCE , + .major =8 , + .minor =2 , + .rev =0 , + .funcs = &dce_v8_0_ip_funcs, +}; + +const struct amdgpu_ip_block_version dce_v8_3_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_DCE , + .major =8 , + .minor =3 , + .rev =0 , + .funcs = &dce_v8_0_ip_funcs, +}; + +const struct amdgpu_ip_block_version dce_v8_5_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_DCE , + .major =8 , + .minor =5 , + .rev =0 , + .funcs = &dce_v8_0_ip_funcs, +};drivers/gpu/drm/amd/amdgpu/dce_v8_0.h +5
-1@@ -24,7 +24,11 @@#ifndef __DCE_V8_0_H__#define __DCE_V8_0_H__ -extern const struct amd_ip_funcs dce_v8_0_ip_funcs; +extern const struct amdgpu_ip_block_version dce_v8_0_ip_block; +extern const struct amdgpu_ip_block_version dce_v8_1_ip_block; +extern const struct amdgpu_ip_block_version dce_v8_2_ip_block; +extern const struct amdgpu_ip_block_version dce_v8_3_ip_block; +extern const struct amdgpu_ip_block_version dce_v8_5_ip_block;void dce_v8_0_disable_dce (struct amdgpu_device *adev);drivers/gpu/drm/amd/amdgpu/dce_virtual.c +9
-1@@ -574,7 +574,7 @@ static int dce_virtual_set_powergating_state(void *handle,return 0 ; } -const struct amd_ip_funcs dce_virtual_ip_funcs = { +static const struct amd_ip_funcs dce_virtual_ip_funcs = { .name ="dce_virtual" , .early_init = dce_virtual_early_init, .late_init =NULL ,@@ -824,3 +824,11 @@ static void dce_virtual_set_irq_funcs(struct amdgpu_device *adev) adev->crtc_irq.funcs = &dce_virtual_crtc_irq_funcs; } +const struct amdgpu_ip_block_version dce_virtual_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_DCE , + .major =1 , + .minor =0 , + .rev =0 , + .funcs = &dce_virtual_ip_funcs, +};drivers/gpu/drm/amd/amdgpu/dce_virtual.h +1
-1@@ -24,7 +24,7 @@#ifndef __DCE_VIRTUAL_H__#define __DCE_VIRTUAL_H__ -extern const struct amd_ip_funcs dce_virtual_ip_funcs; +extern const struct amdgpu_ip_block_version dce_virtual_ip_block;#endif drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c +10
-1@@ -3206,7 +3206,7 @@ static int gfx_v6_0_set_powergating_state(void *handle,return 0 ; } -const struct amd_ip_funcs gfx_v6_0_ip_funcs = { +static const struct amd_ip_funcs gfx_v6_0_ip_funcs = { .name ="gfx_v6_0" , .early_init = gfx_v6_0_early_init, .late_init =NULL ,@@ -3344,3 +3344,12 @@ static void gfx_v6_0_get_cu_info(struct amdgpu_device *adev) cu_info->number = active_cu_number; cu_info->ao_cu_mask = ao_cu_mask; } + +const struct amdgpu_ip_block_version gfx_v6_0_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_GFX , + .major =6 , + .minor =0 , + .rev =0 , + .funcs = &gfx_v6_0_ip_funcs, +};drivers/gpu/drm/amd/amdgpu/gfx_v6_0.h +1
-1@@ -24,6 +24,6 @@#ifndef __GFX_V6_0_H__#define __GFX_V6_0_H__ -extern const struct amd_ip_funcs gfx_v6_0_ip_funcs; +extern const struct amdgpu_ip_block_version gfx_v6_0_ip_block;#endif drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c +37
-1@@ -5087,7 +5087,7 @@ static int gfx_v7_0_set_powergating_state(void *handle,return 0 ; } -const struct amd_ip_funcs gfx_v7_0_ip_funcs = { +static const struct amd_ip_funcs gfx_v7_0_ip_funcs = { .name ="gfx_v7_0" , .early_init = gfx_v7_0_early_init, .late_init = gfx_v7_0_late_init,@@ -5270,3 +5270,39 @@ static void gfx_v7_0_get_cu_info(struct amdgpu_device *adev) cu_info->number = active_cu_number; cu_info->ao_cu_mask = ao_cu_mask; } + +const struct amdgpu_ip_block_version gfx_v7_0_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_GFX , + .major =7 , + .minor =0 , + .rev =0 , + .funcs = &gfx_v7_0_ip_funcs, +}; + +const struct amdgpu_ip_block_version gfx_v7_1_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_GFX , + .major =7 , + .minor =1 , + .rev =0 , + .funcs = &gfx_v7_0_ip_funcs, +}; + +const struct amdgpu_ip_block_version gfx_v7_2_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_GFX , + .major =7 , + .minor =2 , + .rev =0 , + .funcs = &gfx_v7_0_ip_funcs, +}; + +const struct amdgpu_ip_block_version gfx_v7_3_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_GFX , + .major =7 , + .minor =3 , + .rev =0 , + .funcs = &gfx_v7_0_ip_funcs, +};drivers/gpu/drm/amd/amdgpu/gfx_v7_0.h +4
-1@@ -24,6 +24,9 @@#ifndef __GFX_V7_0_H__#define __GFX_V7_0_H__ -extern const struct amd_ip_funcs gfx_v7_0_ip_funcs; +extern const struct amdgpu_ip_block_version gfx_v7_0_ip_block; +extern const struct amdgpu_ip_block_version gfx_v7_1_ip_block; +extern const struct amdgpu_ip_block_version gfx_v7_2_ip_block; +extern const struct amdgpu_ip_block_version gfx_v7_3_ip_block;#endif drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +19
-1@@ -6504,7 +6504,7 @@ static int gfx_v8_0_priv_inst_irq(struct amdgpu_device *adev,return 0 ; } -const struct amd_ip_funcs gfx_v8_0_ip_funcs = { +static const struct amd_ip_funcs gfx_v8_0_ip_funcs = { .name ="gfx_v8_0" , .early_init = gfx_v8_0_early_init, .late_init = gfx_v8_0_late_init,@@ -6734,3 +6734,21 @@ static void gfx_v8_0_get_cu_info(struct amdgpu_device *adev) cu_info->number = active_cu_number; cu_info->ao_cu_mask = ao_cu_mask; } + +const struct amdgpu_ip_block_version gfx_v8_0_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_GFX , + .major =8 , + .minor =0 , + .rev =0 , + .funcs = &gfx_v8_0_ip_funcs, +}; + +const struct amdgpu_ip_block_version gfx_v8_1_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_GFX , + .major =8 , + .minor =1 , + .rev =0 , + .funcs = &gfx_v8_0_ip_funcs, +};drivers/gpu/drm/amd/amdgpu/gfx_v8_0.h +2
-1@@ -24,6 +24,7 @@#ifndef __GFX_V8_0_H__#define __GFX_V8_0_H__ -extern const struct amd_ip_funcs gfx_v8_0_ip_funcs; +extern const struct amdgpu_ip_block_version gfx_v8_0_ip_block; +extern const struct amdgpu_ip_block_version gfx_v8_1_ip_block;#endif drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c +9
-1@@ -1030,7 +1030,7 @@ static int gmc_v6_0_set_powergating_state(void *handle,return 0 ; } -const struct amd_ip_funcs gmc_v6_0_ip_funcs = { +static const struct amd_ip_funcs gmc_v6_0_ip_funcs = { .name ="gmc_v6_0" , .early_init = gmc_v6_0_early_init, .late_init = gmc_v6_0_late_init,@@ -1069,3 +1069,11 @@ static void gmc_v6_0_set_irq_funcs(struct amdgpu_device *adev) adev->mc.vm_fault.funcs = &gmc_v6_0_irq_funcs; } +const struct amdgpu_ip_block_version gmc_v6_0_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_GMC , + .major =6 , + .minor =0 , + .rev =0 , + .funcs = &gmc_v6_0_ip_funcs, +};drivers/gpu/drm/amd/amdgpu/gmc_v6_0.h +1
-1@@ -24,6 +24,6 @@#ifndef __GMC_V6_0_H__#define __GMC_V6_0_H__ -extern const struct amd_ip_funcs gmc_v6_0_ip_funcs; +extern const struct amdgpu_ip_block_version gmc_v6_0_ip_block;#endif drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +19
-1@@ -1235,7 +1235,7 @@ static int gmc_v7_0_set_powergating_state(void *handle,return 0 ; } -const struct amd_ip_funcs gmc_v7_0_ip_funcs = { +static const struct amd_ip_funcs gmc_v7_0_ip_funcs = { .name ="gmc_v7_0" , .early_init = gmc_v7_0_early_init, .late_init = gmc_v7_0_late_init,@@ -1273,3 +1273,21 @@ static void gmc_v7_0_set_irq_funcs(struct amdgpu_device *adev) adev->mc.vm_fault.num_types =1 ; adev->mc.vm_fault.funcs = &gmc_v7_0_irq_funcs; } + +const struct amdgpu_ip_block_version gmc_v7_0_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_GMC , + .major =7 , + .minor =0 , + .rev =0 , + .funcs = &gmc_v7_0_ip_funcs, +}; + +const struct amdgpu_ip_block_version gmc_v7_4_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_GMC , + .major =7 , + .minor =4 , + .rev =0 , + .funcs = &gmc_v7_0_ip_funcs, +};drivers/gpu/drm/amd/amdgpu/gmc_v7_0.h +2
-1@@ -24,6 +24,7 @@#ifndef __GMC_V7_0_H__#define __GMC_V7_0_H__ -extern const struct amd_ip_funcs gmc_v7_0_ip_funcs; +extern const struct amdgpu_ip_block_version gmc_v7_0_ip_block; +extern const struct amdgpu_ip_block_version gmc_v7_4_ip_block;#endif drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +28
-1@@ -1436,7 +1436,7 @@ static int gmc_v8_0_set_powergating_state(void *handle,return 0 ; } -const struct amd_ip_funcs gmc_v8_0_ip_funcs = { +static const struct amd_ip_funcs gmc_v8_0_ip_funcs = { .name ="gmc_v8_0" , .early_init = gmc_v8_0_early_init, .late_init = gmc_v8_0_late_init,@@ -1477,3 +1477,30 @@ static void gmc_v8_0_set_irq_funcs(struct amdgpu_device *adev) adev->mc.vm_fault.num_types =1 ; adev->mc.vm_fault.funcs = &gmc_v8_0_irq_funcs; } + +const struct amdgpu_ip_block_version gmc_v8_0_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_GMC , + .major =8 , + .minor =0 , + .rev =0 , + .funcs = &gmc_v8_0_ip_funcs, +}; + +const struct amdgpu_ip_block_version gmc_v8_1_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_GMC , + .major =8 , + .minor =1 , + .rev =0 , + .funcs = &gmc_v8_0_ip_funcs, +}; + +const struct amdgpu_ip_block_version gmc_v8_5_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_GMC , + .major =8 , + .minor =5 , + .rev =0 , + .funcs = &gmc_v8_0_ip_funcs, +};drivers/gpu/drm/amd/amdgpu/gmc_v8_0.h +3
-1@@ -24,6 +24,8 @@#ifndef __GMC_V8_0_H__#define __GMC_V8_0_H__ -extern const struct amd_ip_funcs gmc_v8_0_ip_funcs; +extern const struct amdgpu_ip_block_version gmc_v8_0_ip_block; +extern const struct amdgpu_ip_block_version gmc_v8_1_ip_block; +extern const struct amdgpu_ip_block_version gmc_v8_5_ip_block;#endif drivers/gpu/drm/amd/amdgpu/iceland_ih.c +9
-1@@ -392,7 +392,7 @@ static int iceland_ih_set_powergating_state(void *handle,return 0 ; } -const struct amd_ip_funcs iceland_ih_ip_funcs = { +static const struct amd_ip_funcs iceland_ih_ip_funcs = { .name ="iceland_ih" , .early_init = iceland_ih_early_init, .late_init =NULL ,@@ -421,3 +421,11 @@ static void iceland_ih_set_interrupt_funcs(struct amdgpu_device *adev) adev->irq.ih_funcs = &iceland_ih_funcs; } +const struct amdgpu_ip_block_version iceland_ih_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_IH , + .major =2 , + .minor =4 , + .rev =0 , + .funcs = &iceland_ih_ip_funcs, +};drivers/gpu/drm/amd/amdgpu/iceland_ih.h +1
-1@@ -24,6 +24,6 @@#ifndef __ICELAND_IH_H__#define __ICELAND_IH_H__ -extern const struct amd_ip_funcs iceland_ih_ip_funcs; +extern const struct amdgpu_ip_block_version iceland_ih_ip_block;#endif /* __ICELAND_IH_H__ */ drivers/gpu/drm/amd/amdgpu/kv_dpm.c +9
-0@@ -3292,3 +3292,12 @@ static void kv_dpm_set_irq_funcs(struct amdgpu_device *adev) adev->pm.dpm.thermal.irq.num_types =AMDGPU_THERMAL_IRQ_LAST ; adev->pm.dpm.thermal.irq.funcs = &kv_dpm_irq_funcs; } + +const struct amdgpu_ip_block_version kv_dpm_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_SMC , + .major =7 , + .minor =0 , + .rev =0 , + .funcs = &kv_dpm_ip_funcs, +};drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c +10
-1@@ -1187,7 +1187,7 @@ static int sdma_v2_4_set_powergating_state(void *handle,return 0 ; } -const struct amd_ip_funcs sdma_v2_4_ip_funcs = { +static const struct amd_ip_funcs sdma_v2_4_ip_funcs = { .name ="sdma_v2_4" , .early_init = sdma_v2_4_early_init, .late_init =NULL ,@@ -1340,3 +1340,12 @@ static void sdma_v2_4_set_vm_pte_funcs(struct amdgpu_device *adev) adev->vm_manager.vm_pte_num_rings = adev->sdma.num_instances; } } + +const struct amdgpu_ip_block_version sdma_v2_4_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_SDMA , + .major =2 , + .minor =4 , + .rev =0 , + .funcs = &sdma_v2_4_ip_funcs, +};drivers/gpu/drm/amd/amdgpu/sdma_v2_4.h +1
-1@@ -24,6 +24,6 @@#ifndef __SDMA_V2_4_H__#define __SDMA_V2_4_H__ -extern const struct amd_ip_funcs sdma_v2_4_ip_funcs; +extern const struct amdgpu_ip_block_version sdma_v2_4_ip_block;#endif drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c +19
-1@@ -1527,7 +1527,7 @@ static int sdma_v3_0_set_powergating_state(void *handle,return 0 ; } -const struct amd_ip_funcs sdma_v3_0_ip_funcs = { +static const struct amd_ip_funcs sdma_v3_0_ip_funcs = { .name ="sdma_v3_0" , .early_init = sdma_v3_0_early_init, .late_init =NULL ,@@ -1683,3 +1683,21 @@ static void sdma_v3_0_set_vm_pte_funcs(struct amdgpu_device *adev) adev->vm_manager.vm_pte_num_rings = adev->sdma.num_instances; } } + +const struct amdgpu_ip_block_version sdma_v3_0_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_SDMA , + .major =3 , + .minor =0 , + .rev =0 , + .funcs = &sdma_v3_0_ip_funcs, +}; + +const struct amdgpu_ip_block_version sdma_v3_1_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_SDMA , + .major =3 , + .minor =1 , + .rev =0 , + .funcs = &sdma_v3_0_ip_funcs, +};drivers/gpu/drm/amd/amdgpu/sdma_v3_0.h +2
-1@@ -24,6 +24,7 @@#ifndef __SDMA_V3_0_H__#define __SDMA_V3_0_H__ -extern const struct amd_ip_funcs sdma_v3_0_ip_funcs; +extern const struct amdgpu_ip_block_version sdma_v3_0_ip_block; +extern const struct amdgpu_ip_block_version sdma_v3_1_ip_block;#endif drivers/gpu/drm/amd/amdgpu/si.c +40
-248@@ -1812,7 +1812,7 @@ static int si_common_set_powergating_state(void *handle,return 0 ; } -const struct amd_ip_funcs si_common_ip_funcs = { +static const struct amd_ip_funcs si_common_ip_funcs = { .name ="si_common" , .early_init = si_common_early_init, .late_init =NULL ,@@ -1829,240 +1829,13 @@ const struct amd_ip_funcs si_common_ip_funcs = { .set_powergating_state = si_common_set_powergating_state, }; -static const struct amdgpu_ip_block_version verde_ip_blocks[] = +static const struct amdgpu_ip_block_version si_common_ip_block = { - { - .type =AMD_IP_BLOCK_TYPE_COMMON , - .major =1 , - .minor =0 , - .rev =0 , - .funcs = &si_common_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_GMC , - .major =6 , - .minor =0 , - .rev =0 , - .funcs = &gmc_v6_0_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_IH , - .major =1 , - .minor =0 , - .rev =0 , - .funcs = &si_ih_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_SMC , - .major =6 , - .minor =0 , - .rev =0 , - .funcs = &amdgpu_pp_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_DCE , - .major =6 , - .minor =0 , - .rev =0 , - .funcs = &dce_v6_0_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_GFX , - .major =6 , - .minor =0 , - .rev =0 , - .funcs = &gfx_v6_0_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_SDMA , - .major =1 , - .minor =0 , - .rev =0 , - .funcs = &si_dma_ip_funcs, - }, -/* { -.type = AMD_IP_BLOCK_TYPE_UVD, -.major = 3, -.minor = 1, -.rev = 0, -.funcs = &si_null_ip_funcs, -}, -{ -.type = AMD_IP_BLOCK_TYPE_VCE, -.major = 1, -.minor = 0, -.rev = 0, -.funcs = &si_null_ip_funcs, -}, -*/ -}; - - -static const struct amdgpu_ip_block_version verde_ip_blocks_vd[] = -{ - { - .type =AMD_IP_BLOCK_TYPE_COMMON , - .major =1 , - .minor =0 , - .rev =0 , - .funcs = &si_common_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_GMC , - .major =6 , - .minor =0 , - .rev =0 , - .funcs = &gmc_v6_0_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_IH , - .major =1 , - .minor =0 , - .rev =0 , - .funcs = &si_ih_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_SMC , - .major =6 , - .minor =0 , - .rev =0 , - .funcs = &amdgpu_pp_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_DCE , - .major =6 , - .minor =0 , - .rev =0 , - .funcs = &dce_virtual_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_GFX , - .major =6 , - .minor =0 , - .rev =0 , - .funcs = &gfx_v6_0_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_SDMA , - .major =1 , - .minor =0 , - .rev =0 , - .funcs = &si_dma_ip_funcs, - }, -/* { -.type = AMD_IP_BLOCK_TYPE_UVD, -.major = 3, -.minor = 1, -.rev = 0, -.funcs = &si_null_ip_funcs, -}, -{ -.type = AMD_IP_BLOCK_TYPE_VCE, -.major = 1, -.minor = 0, -.rev = 0, -.funcs = &si_null_ip_funcs, -}, -*/ -}; - -static const struct amdgpu_ip_block_version hainan_ip_blocks[] = -{ - { - .type =AMD_IP_BLOCK_TYPE_COMMON , - .major =1 , - .minor =0 , - .rev =0 , - .funcs = &si_common_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_GMC , - .major =6 , - .minor =0 , - .rev =0 , - .funcs = &gmc_v6_0_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_IH , - .major =1 , - .minor =0 , - .rev =0 , - .funcs = &si_ih_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_SMC , - .major =6 , - .minor =0 , - .rev =0 , - .funcs = &amdgpu_pp_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_GFX , - .major =6 , - .minor =0 , - .rev =0 , - .funcs = &gfx_v6_0_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_SDMA , - .major =1 , - .minor =0 , - .rev =0 , - .funcs = &si_dma_ip_funcs, - }, -}; - -static const struct amdgpu_ip_block_version hainan_ip_blocks_vd[] = -{ - { - .type =AMD_IP_BLOCK_TYPE_COMMON , - .major =1 , - .minor =0 , - .rev =0 , - .funcs = &si_common_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_GMC , - .major =6 , - .minor =0 , - .rev =0 , - .funcs = &gmc_v6_0_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_IH , - .major =1 , - .minor =0 , - .rev =0 , - .funcs = &si_ih_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_SMC , - .major =6 , - .minor =0 , - .rev =0 , - .funcs = &amdgpu_pp_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_DCE , - .major =1 , - .minor =0 , - .rev =0 , - .funcs = &dce_virtual_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_GFX , - .major =6 , - .minor =0 , - .rev =0 , - .funcs = &gfx_v6_0_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_SDMA , - .major =1 , - .minor =0 , - .rev =0 , - .funcs = &si_dma_ip_funcs, - }, + .type =AMD_IP_BLOCK_TYPE_COMMON , + .major =1 , + .minor =0 , + .rev =0 , + .funcs = &si_common_ip_funcs, };int si_set_ip_blocks (struct amdgpu_device *adev)@@ -2071,23 +1844,42 @@ int si_set_ip_blocks(struct amdgpu_device *adev)case CHIP_VERDE :case CHIP_TAHITI :case CHIP_PITCAIRN : +amdgpu_ip_block_add (adev, &si_common_ip_block); +amdgpu_ip_block_add (adev, &gmc_v6_0_ip_block); +amdgpu_ip_block_add (adev, &si_ih_ip_block); +amdgpu_ip_block_add (adev, &amdgpu_pp_ip_block); +if (adev->enable_virtual_display) +amdgpu_ip_block_add (adev, &dce_virtual_ip_block); +else +amdgpu_ip_block_add (adev, &dce_v6_0_ip_block); +amdgpu_ip_block_add (adev, &gfx_v6_0_ip_block); +amdgpu_ip_block_add (adev, &si_dma_ip_block); +/* amdgpu_ip_block_add(adev, &uvd_v3_1_ip_block); */ +/* amdgpu_ip_block_add(adev, &vce_v1_0_ip_block); */ +break ;case CHIP_OLAND : -if (adev->enable_virtual_display) { - adev->ip_blocks = verde_ip_blocks_vd; - adev->num_ip_blocks =ARRAY_SIZE (verde_ip_blocks_vd); - }else { - adev->ip_blocks = verde_ip_blocks; - adev->num_ip_blocks =ARRAY_SIZE (verde_ip_blocks); - } +amdgpu_ip_block_add (adev, &si_common_ip_block); +amdgpu_ip_block_add (adev, &gmc_v6_0_ip_block); +amdgpu_ip_block_add (adev, &si_ih_ip_block); +amdgpu_ip_block_add (adev, &amdgpu_pp_ip_block); +if (adev->enable_virtual_display) +amdgpu_ip_block_add (adev, &dce_virtual_ip_block); +else +amdgpu_ip_block_add (adev, &dce_v6_4_ip_block); +amdgpu_ip_block_add (adev, &gfx_v6_0_ip_block); +amdgpu_ip_block_add (adev, &si_dma_ip_block); +/* amdgpu_ip_block_add(adev, &uvd_v3_1_ip_block); */ +/* amdgpu_ip_block_add(adev, &vce_v1_0_ip_block); */ break ;case CHIP_HAINAN : -if (adev->enable_virtual_display) { - adev->ip_blocks = hainan_ip_blocks_vd; - adev->num_ip_blocks =ARRAY_SIZE (hainan_ip_blocks_vd); - }else { - adev->ip_blocks = hainan_ip_blocks; - adev->num_ip_blocks =ARRAY_SIZE (hainan_ip_blocks); - } +amdgpu_ip_block_add (adev, &si_common_ip_block); +amdgpu_ip_block_add (adev, &gmc_v6_0_ip_block); +amdgpu_ip_block_add (adev, &si_ih_ip_block); +amdgpu_ip_block_add (adev, &amdgpu_pp_ip_block); +if (adev->enable_virtual_display) +amdgpu_ip_block_add (adev, &dce_virtual_ip_block); +amdgpu_ip_block_add (adev, &gfx_v6_0_ip_block); +amdgpu_ip_block_add (adev, &si_dma_ip_block);break ;default :BUG ();drivers/gpu/drm/amd/amdgpu/si.h +0
-2@@ -24,8 +24,6 @@#ifndef __SI_H__#define __SI_H__ -extern const struct amd_ip_funcs si_common_ip_funcs; -void si_srbm_select (struct amdgpu_device *adev,u32 me,u32 pipe,u32 queue,u32 vmid);int si_set_ip_blocks (struct amdgpu_device *adev);drivers/gpu/drm/amd/amdgpu/si_dma.c +10
-1@@ -745,7 +745,7 @@ static int si_dma_set_powergating_state(void *handle,return 0 ; } -const struct amd_ip_funcs si_dma_ip_funcs = { +static const struct amd_ip_funcs si_dma_ip_funcs = { .name ="si_dma" , .early_init = si_dma_early_init, .late_init =NULL ,@@ -903,3 +903,12 @@ static void si_dma_set_vm_pte_funcs(struct amdgpu_device *adev) adev->vm_manager.vm_pte_num_rings = adev->sdma.num_instances; } } + +const struct amdgpu_ip_block_version si_dma_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_SDMA , + .major =1 , + .minor =0 , + .rev =0 , + .funcs = &si_dma_ip_funcs, +};drivers/gpu/drm/amd/amdgpu/si_dma.h +1
-1@@ -24,6 +24,6 @@#ifndef __SI_DMA_H__#define __SI_DMA_H__ -extern const struct amd_ip_funcs si_dma_ip_funcs; +extern const struct amdgpu_ip_block_version si_dma_ip_block;#endif drivers/gpu/drm/amd/amdgpu/si_dpm.c +8
-0@@ -8011,3 +8011,11 @@ static void si_dpm_set_irq_funcs(struct amdgpu_device *adev) adev->pm.dpm.thermal.irq.funcs = &si_dpm_irq_funcs; } +const struct amdgpu_ip_block_version si_dpm_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_SMC , + .major =6 , + .minor =0 , + .rev =0 , + .funcs = &si_dpm_ip_funcs, +};drivers/gpu/drm/amd/amdgpu/si_ih.c +9
-1@@ -268,7 +268,7 @@ static int si_ih_set_powergating_state(void *handle,return 0 ; } -const struct amd_ip_funcs si_ih_ip_funcs = { +static const struct amd_ip_funcs si_ih_ip_funcs = { .name ="si_ih" , .early_init = si_ih_early_init, .late_init =NULL ,@@ -297,3 +297,11 @@ static void si_ih_set_interrupt_funcs(struct amdgpu_device *adev) adev->irq.ih_funcs = &si_ih_funcs; } +const struct amdgpu_ip_block_version si_ih_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_IH , + .major =1 , + .minor =0 , + .rev =0 , + .funcs = &si_ih_ip_funcs, +};drivers/gpu/drm/amd/amdgpu/si_ih.h +1
-1@@ -24,6 +24,6 @@#ifndef __SI_IH_H__#define __SI_IH_H__ -extern const struct amd_ip_funcs si_ih_ip_funcs; +extern const struct amdgpu_ip_block_version si_ih_ip_block;#endif drivers/gpu/drm/amd/amdgpu/tonga_ih.c +9
-1@@ -455,7 +455,7 @@ static int tonga_ih_set_powergating_state(void *handle,return 0 ; } -const struct amd_ip_funcs tonga_ih_ip_funcs = { +static const struct amd_ip_funcs tonga_ih_ip_funcs = { .name ="tonga_ih" , .early_init = tonga_ih_early_init, .late_init =NULL ,@@ -487,3 +487,11 @@ static void tonga_ih_set_interrupt_funcs(struct amdgpu_device *adev) adev->irq.ih_funcs = &tonga_ih_funcs; } +const struct amdgpu_ip_block_version tonga_ih_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_IH , + .major =3 , + .minor =0 , + .rev =0 , + .funcs = &tonga_ih_ip_funcs, +};drivers/gpu/drm/amd/amdgpu/tonga_ih.h +2
-2@@ -24,6 +24,6 @@#ifndef __TONGA_IH_H__#define __TONGA_IH_H__ -extern const struct amd_ip_funcs tonga_ih_ip_funcs; +extern const struct amdgpu_ip_block_version tonga_ih_ip_block; -#endif /* __CZ_IH_H__ */ +#endif /* __TONGA_IH_H__ */ drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c +10
-1@@ -723,7 +723,7 @@ static int uvd_v4_2_set_powergating_state(void *handle, } } -const struct amd_ip_funcs uvd_v4_2_ip_funcs = { +static const struct amd_ip_funcs uvd_v4_2_ip_funcs = { .name ="uvd_v4_2" , .early_init = uvd_v4_2_early_init, .late_init =NULL ,@@ -780,3 +780,12 @@ static void uvd_v4_2_set_irq_funcs(struct amdgpu_device *adev) adev->uvd.irq.num_types =1 ; adev->uvd.irq.funcs = &uvd_v4_2_irq_funcs; } + +const struct amdgpu_ip_block_version uvd_v4_2_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_UVD , + .major =4 , + .minor =2 , + .rev =0 , + .funcs = &uvd_v4_2_ip_funcs, +};drivers/gpu/drm/amd/amdgpu/uvd_v4_2.h +1
-1@@ -24,6 +24,6 @@#ifndef __UVD_V4_2_H__#define __UVD_V4_2_H__ -extern const struct amd_ip_funcs uvd_v4_2_ip_funcs; +extern const struct amdgpu_ip_block_version uvd_v4_2_ip_block;#endif drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c +10
-1@@ -774,7 +774,7 @@ static int uvd_v5_0_set_powergating_state(void *handle, } } -const struct amd_ip_funcs uvd_v5_0_ip_funcs = { +static const struct amd_ip_funcs uvd_v5_0_ip_funcs = { .name ="uvd_v5_0" , .early_init = uvd_v5_0_early_init, .late_init =NULL ,@@ -831,3 +831,12 @@ static void uvd_v5_0_set_irq_funcs(struct amdgpu_device *adev) adev->uvd.irq.num_types =1 ; adev->uvd.irq.funcs = &uvd_v5_0_irq_funcs; } + +const struct amdgpu_ip_block_version uvd_v5_0_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_UVD , + .major =5 , + .minor =0 , + .rev =0 , + .funcs = &uvd_v5_0_ip_funcs, +};drivers/gpu/drm/amd/amdgpu/uvd_v5_0.h +1
-1@@ -24,6 +24,6 @@#ifndef __UVD_V5_0_H__#define __UVD_V5_0_H__ -extern const struct amd_ip_funcs uvd_v5_0_ip_funcs; +extern const struct amdgpu_ip_block_version uvd_v5_0_ip_block;#endif drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c +28
-1@@ -1001,7 +1001,7 @@ static int uvd_v6_0_set_powergating_state(void *handle, } } -const struct amd_ip_funcs uvd_v6_0_ip_funcs = { +static const struct amd_ip_funcs uvd_v6_0_ip_funcs = { .name ="uvd_v6_0" , .early_init = uvd_v6_0_early_init, .late_init =NULL ,@@ -1096,3 +1096,30 @@ static void uvd_v6_0_set_irq_funcs(struct amdgpu_device *adev) adev->uvd.irq.num_types =1 ; adev->uvd.irq.funcs = &uvd_v6_0_irq_funcs; } + +const struct amdgpu_ip_block_version uvd_v6_0_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_UVD , + .major =6 , + .minor =0 , + .rev =0 , + .funcs = &uvd_v6_0_ip_funcs, +}; + +const struct amdgpu_ip_block_version uvd_v6_2_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_UVD , + .major =6 , + .minor =2 , + .rev =0 , + .funcs = &uvd_v6_0_ip_funcs, +}; + +const struct amdgpu_ip_block_version uvd_v6_3_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_UVD , + .major =6 , + .minor =3 , + .rev =0 , + .funcs = &uvd_v6_0_ip_funcs, +};drivers/gpu/drm/amd/amdgpu/uvd_v6_0.h +3
-1@@ -24,6 +24,8 @@#ifndef __UVD_V6_0_H__#define __UVD_V6_0_H__ -extern const struct amd_ip_funcs uvd_v6_0_ip_funcs; +extern const struct amdgpu_ip_block_version uvd_v6_0_ip_block; +extern const struct amdgpu_ip_block_version uvd_v6_2_ip_block; +extern const struct amdgpu_ip_block_version uvd_v6_3_ip_block;#endif drivers/gpu/drm/amd/amdgpu/vce_v2_0.c +10
-1@@ -592,7 +592,7 @@ static int vce_v2_0_set_powergating_state(void *handle,return vce_v2_0_start (adev); } -const struct amd_ip_funcs vce_v2_0_ip_funcs = { +static const struct amd_ip_funcs vce_v2_0_ip_funcs = { .name ="vce_v2_0" , .early_init = vce_v2_0_early_init, .late_init =NULL ,@@ -647,3 +647,12 @@ static void vce_v2_0_set_irq_funcs(struct amdgpu_device *adev) adev->vce.irq.num_types =1 ; adev->vce.irq.funcs = &vce_v2_0_irq_funcs; }; + +const struct amdgpu_ip_block_version vce_v2_0_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_VCE , + .major =2 , + .minor =0 , + .rev =0 , + .funcs = &vce_v2_0_ip_funcs, +};drivers/gpu/drm/amd/amdgpu/vce_v2_0.h +1
-1@@ -24,6 +24,6 @@#ifndef __VCE_V2_0_H__#define __VCE_V2_0_H__ -extern const struct amd_ip_funcs vce_v2_0_ip_funcs; +extern const struct amdgpu_ip_block_version vce_v2_0_ip_block;#endif drivers/gpu/drm/amd/amdgpu/vce_v3_0.c +28
-1@@ -807,7 +807,7 @@ static void vce_v3_0_emit_pipeline_sync(struct amdgpu_ring *ring)amdgpu_ring_write (ring, seq); } -const struct amd_ip_funcs vce_v3_0_ip_funcs = { +static const struct amd_ip_funcs vce_v3_0_ip_funcs = { .name ="vce_v3_0" , .early_init = vce_v3_0_early_init, .late_init =NULL ,@@ -898,3 +898,30 @@ static void vce_v3_0_set_irq_funcs(struct amdgpu_device *adev) adev->vce.irq.num_types =1 ; adev->vce.irq.funcs = &vce_v3_0_irq_funcs; }; + +const struct amdgpu_ip_block_version vce_v3_0_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_VCE , + .major =3 , + .minor =0 , + .rev =0 , + .funcs = &vce_v3_0_ip_funcs, +}; + +const struct amdgpu_ip_block_version vce_v3_1_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_VCE , + .major =3 , + .minor =1 , + .rev =0 , + .funcs = &vce_v3_0_ip_funcs, +}; + +const struct amdgpu_ip_block_version vce_v3_4_ip_block = +{ + .type =AMD_IP_BLOCK_TYPE_VCE , + .major =3 , + .minor =4 , + .rev =0 , + .funcs = &vce_v3_0_ip_funcs, +};drivers/gpu/drm/amd/amdgpu/vce_v3_0.h +3
-1@@ -24,6 +24,8 @@#ifndef __VCE_V3_0_H__#define __VCE_V3_0_H__ -extern const struct amd_ip_funcs vce_v3_0_ip_funcs; +extern const struct amdgpu_ip_block_version vce_v3_0_ip_block; +extern const struct amdgpu_ip_block_version vce_v3_1_ip_block; +extern const struct amdgpu_ip_block_version vce_v3_4_ip_block;#endif drivers/gpu/drm/amd/amdgpu/vi.c +108
-729@@ -858,734 +858,6 @@ static void vi_enable_doorbell_aperture(struct amdgpu_device *adev,WREG32 (mmBIF_DOORBELL_APER_EN, tmp); } -/* topaz has no DCE, UVD, VCE */ -static const struct amdgpu_ip_block_version topaz_ip_blocks[] = -{ -/* ORDER MATTERS! */ - { - .type =AMD_IP_BLOCK_TYPE_COMMON , - .major =2 , - .minor =0 , - .rev =0 , - .funcs = &vi_common_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_GMC , - .major =7 , - .minor =4 , - .rev =0 , - .funcs = &gmc_v7_0_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_IH , - .major =2 , - .minor =4 , - .rev =0 , - .funcs = &iceland_ih_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_SMC , - .major =7 , - .minor =1 , - .rev =0 , - .funcs = &amdgpu_pp_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_GFX , - .major =8 , - .minor =0 , - .rev =0 , - .funcs = &gfx_v8_0_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_SDMA , - .major =2 , - .minor =4 , - .rev =0 , - .funcs = &sdma_v2_4_ip_funcs, - }, -}; - -static const struct amdgpu_ip_block_version topaz_ip_blocks_vd[] = -{ -/* ORDER MATTERS! */ - { - .type =AMD_IP_BLOCK_TYPE_COMMON , - .major =2 , - .minor =0 , - .rev =0 , - .funcs = &vi_common_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_GMC , - .major =7 , - .minor =4 , - .rev =0 , - .funcs = &gmc_v7_0_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_IH , - .major =2 , - .minor =4 , - .rev =0 , - .funcs = &iceland_ih_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_SMC , - .major =7 , - .minor =1 , - .rev =0 , - .funcs = &amdgpu_pp_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_DCE , - .major =1 , - .minor =0 , - .rev =0 , - .funcs = &dce_virtual_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_GFX , - .major =8 , - .minor =0 , - .rev =0 , - .funcs = &gfx_v8_0_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_SDMA , - .major =2 , - .minor =4 , - .rev =0 , - .funcs = &sdma_v2_4_ip_funcs, - }, -}; - -static const struct amdgpu_ip_block_version tonga_ip_blocks[] = -{ -/* ORDER MATTERS! */ - { - .type =AMD_IP_BLOCK_TYPE_COMMON , - .major =2 , - .minor =0 , - .rev =0 , - .funcs = &vi_common_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_GMC , - .major =8 , - .minor =0 , - .rev =0 , - .funcs = &gmc_v8_0_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_IH , - .major =3 , - .minor =0 , - .rev =0 , - .funcs = &tonga_ih_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_SMC , - .major =7 , - .minor =1 , - .rev =0 , - .funcs = &amdgpu_pp_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_DCE , - .major =10 , - .minor =0 , - .rev =0 , - .funcs = &dce_v10_0_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_GFX , - .major =8 , - .minor =0 , - .rev =0 , - .funcs = &gfx_v8_0_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_SDMA , - .major =3 , - .minor =0 , - .rev =0 , - .funcs = &sdma_v3_0_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_UVD , - .major =5 , - .minor =0 , - .rev =0 , - .funcs = &uvd_v5_0_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_VCE , - .major =3 , - .minor =0 , - .rev =0 , - .funcs = &vce_v3_0_ip_funcs, - }, -}; - -static const struct amdgpu_ip_block_version tonga_ip_blocks_vd[] = -{ -/* ORDER MATTERS! */ - { - .type =AMD_IP_BLOCK_TYPE_COMMON , - .major =2 , - .minor =0 , - .rev =0 , - .funcs = &vi_common_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_GMC , - .major =8 , - .minor =0 , - .rev =0 , - .funcs = &gmc_v8_0_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_IH , - .major =3 , - .minor =0 , - .rev =0 , - .funcs = &tonga_ih_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_SMC , - .major =7 , - .minor =1 , - .rev =0 , - .funcs = &amdgpu_pp_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_DCE , - .major =10 , - .minor =0 , - .rev =0 , - .funcs = &dce_virtual_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_GFX , - .major =8 , - .minor =0 , - .rev =0 , - .funcs = &gfx_v8_0_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_SDMA , - .major =3 , - .minor =0 , - .rev =0 , - .funcs = &sdma_v3_0_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_UVD , - .major =5 , - .minor =0 , - .rev =0 , - .funcs = &uvd_v5_0_ip_funcs, - }, - { - .type =AMD_IP_BLOCK_TYPE_VCE , - .major =3 , - .minor =0 , - .rev =0 , - .funcs = &vce_v3_0_ip_funcs,Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Part of the diff is not shown here. View the raw message.