drm/amdgpu: rework IP block registration
Subsystems (2)
PATCH 1/1 drm/amdgpu: rework IP block registration
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.
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 39 +- 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 | 240 ++++---- 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 | 8 +- 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, 904 insertions(+), 1938 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +22 -17
@@ -195,21 +195,35 @@ 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);/* provided by hw blocks that can move/clear data. e.g., gfx or sdma */ struct amdgpu_buffer_funcs {
@@ -1271,14 +1285,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 +1440,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 +118 -122
454 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 +4 -4
@@ -23,11 +23,11 @@* */ -#ifndef __AMDGPU_POPWERPLAY_H__ -#define __AMDGPU_POPWERPLAY_H__ +#ifndef __AMDGPU_POWERPLAY_H__ +#define __AMDGPU_POWERPLAY_H__#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 /* __AMDSOC_DM_H__ */ +#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
@@ -8005,3 +8005,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
258 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): 1476395901-1672-1-git-send-email-alexander.deucher-5C7GfCeVMHo@public.gmane.org
Am 13.10.2016 um 23:58 schrieb Alex Deucher:
Quoted 6 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.Signed-off-by Alex Deucher <[email protected]>
...
drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.h line 27
Quoted 12 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.h +2
-2@@ -23,11 +23,11 @@* */ -#ifndef __AMDGPU_POPWERPLAY_H__ -#define __AMDGPU_POPWERPLAY_H__ +#ifndef __AMDGPU_POWERPLAY_H__ +#define __AMDGPU_POWERPLAY_H__
Would be nice to have that in a separate patch.
Quoted 7 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.h +7
-0+int cik_set_ip_blocks (struct amdgpu_device *adev) +{ +switch (adev->asic_type) { +case CHIP_BONAIRE : + adev->ip_blocks[adev->num_ip_blocks++].version = &cik_common_ip_block; + adev->ip_blocks[adev->num_ip_blocks++].version = &gmc_v7_0_ip_block; + adev->ip_blocks[adev->num_ip_blocks++].version = &cik_ih_ip_block;
drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.h
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.h +10
-0+ adev->ip_blocks[adev->num_ip_blocks++].version = &amdgpu_pp_ip_block; +if (adev->enable_virtual_display) + adev->ip_blocks[adev->num_ip_blocks++].version = &dce_virtual_ip_block; +else + adev->ip_blocks[adev->num_ip_blocks++].version = &dce_v8_2_ip_block; + adev->ip_blocks[adev->num_ip_blocks++].version = &gfx_v7_2_ip_block; + adev->ip_blocks[adev->num_ip_blocks++].version = &cik_sdma_ip_block; + adev->ip_blocks[adev->num_ip_blocks++].version = &uvd_v4_2_ip_block; + adev->ip_blocks[adev->num_ip_blocks++].version = &vce_v2_0_ip_block; +break ;
I would add a function for the "adev->ip_blocks[adev->num_ip_blocks++].version = " part.
Maybe we will need to init some more fields in the ip_blocks in the future when it is registered, but at least it would look a bit cleaner.
Apart from that the patch looks good to me.
Christian.
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx