linux-next: manual merge of the drm tree with the origin tree
Subsystems (3)
Mark Brown
maintainerHi all,
Today's linux-next merge of the drm tree got conflicts in:
drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c
between commits:
3eb46fbb601f9 ("drm/amdgpu/gfx11: adjust KGQ reset sequence") dfd64f6e8cd7b ("drm/amdgpu/gfx12: adjust KGQ reset sequence")
from the origin tree and commits:
b340ff216fdab ("drm/amdgpu/gfx11: adjust KGQ reset sequence") 0a6d6ed694d72 ("drm/amdgpu/gfx12: adjust KGQ reset sequence")
from the drm tree.
I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts.
drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c +0 -0
@@@ -120,6 -120,10 +120,10 @@@ MODULE_FIRMWARE("amdgpu/gc_11_5_3_pfp.bMODULE_FIRMWARE ("amdgpu/gc_11_5_3_me.bin" );MODULE_FIRMWARE ("amdgpu/gc_11_5_3_mec.bin" );MODULE_FIRMWARE ("amdgpu/gc_11_5_3_rlc.bin" ); +MODULE_FIRMWARE ("amdgpu/gc_11_5_4_pfp.bin" ); +MODULE_FIRMWARE ("amdgpu/gc_11_5_4_me.bin" ); +MODULE_FIRMWARE ("amdgpu/gc_11_5_4_mec.bin" ); +MODULE_FIRMWARE ("amdgpu/gc_11_5_4_rlc.bin" );static const struct amdgpu_hwip_reg_entry gc_reg_list_11_0[] = {SOC15_REG_ENTRY_STR (GC ,0 , regGRBM_STATUS), uint32_t eng_sel = ring->funcs->type == AMDGPU_RING_TYPE_GFX ? 4 : 0;if (adev->enable_mes && !adev->gfx.kiq[0 ].ring.sched.ready) { -amdgpu_mes_unmap_legacy_queue (adev, ring, action, gpu_addr, seq); +amdgpu_mes_unmap_legacy_queue (adev, ring, action, + gpu_addr, seq,0 );return ; }WREG32 (scratch,0xCAFEDEAD ); r =amdgpu_ring_alloc (ring,5 );if (r) { -DRM_ERROR ("amdgpu: cp failed to lock ring %d (%d).\n" , - ring->idx, r); +drm_err (adev_to_drm (adev),"cp failed to lock ring %d (%d).\n" , + ring->idx, r);return r; } r =amdgpu_ib_get (adev,NULL ,20 ,AMDGPU_IB_POOL_DIRECT , &ib);if (r) { -DRM_ERROR ("amdgpu: failed to get ib (%ld).\n" , r); +drm_err (adev_to_drm (adev),"failed to get ib (%ld).\n" , r); goto err1; }/* init spm vmid with 0xf */ if (adev->gfx.rlc.funcs->update_spm_vmid) - adev->gfx.rlc.funcs->update_spm_vmid (adev,NULL ,0xf ); + adev->gfx.rlc.funcs->update_spm_vmid (adev,0 ,NULL ,0xf );return 0 ; }static void gfx_v11_0_get_gfx_shadow_info_nocheck (struct amdgpu_device *adev,struct amdgpu_gfx_shadow_info *shadow_info) { +/* for gfx */ shadow_info->shadow_size =MQD_SHADOW_BASE_SIZE ; shadow_info->shadow_alignment =MQD_SHADOW_BASE_ALIGNMENT ; shadow_info->csa_size =MQD_FWWORKAREA_SIZE ; shadow_info->csa_alignment =MQD_FWWORKAREA_ALIGNMENT ; +/* for compute */ + shadow_info->eop_size =GFX11_MEC_HPD_SIZE ; + shadow_info->eop_alignment =256 ; }static int gfx_v11_0_get_gfx_shadow_info (struct amdgpu_device *adev, .select_me_pipe_q = &gfx_v11_0_select_me_pipe_q, .update_perfmon_mgcg = &gfx_v11_0_update_perf_clk, .get_gfx_shadow_info = &gfx_v11_0_get_gfx_shadow_info, + .get_hdp_flush_mask = &amdgpu_gfx_get_hdp_flush_mask, };static int gfx_v11_0_gpu_early_init (struct amdgpu_device *adev) case IP_VERSION(11, 5, 1): case IP_VERSION(11, 5, 2): case IP_VERSION(11, 5, 3): + case IP_VERSION(11, 5, 4): adev->gfx.config.max_hw_contexts = 8; adev->gfx.config.sc_prim_fifo_size_frontend =0x20 ; adev->gfx.config.sc_prim_fifo_size_backend =0x100 ;case IP_VERSION (11 ,5 ,1 ):case IP_VERSION (11 ,5 ,2 ):case IP_VERSION (11 ,5 ,3 ): +case IP_VERSION (11 ,5 ,4 ): adev->gfx.me.num_me =1 ; adev->gfx.me.num_pipe_per_me =1 ; adev->gfx.me.num_queue_per_pipe =2 ; amdgpu_ip_version(adev, GC_HWIP, 0) == IP_VERSION(11, 5, 0) || amdgpu_ip_version(adev, GC_HWIP, 0) == IP_VERSION(11, 5, 1) || amdgpu_ip_version(adev, GC_HWIP, 0) == IP_VERSION(11, 5, 2) || - amdgpu_ip_version(adev, GC_HWIP, 0) == IP_VERSION(11, 5, 3)) + amdgpu_ip_version(adev, GC_HWIP, 0) == IP_VERSION(11, 5, 3) || + amdgpu_ip_version(adev, GC_HWIP, 0) == IP_VERSION(11, 5, 4)) bootload_status =RREG32_SOC15 (GC ,0 , regRLC_RLCS_BOOTLOAD_STATUS_gc_11_0_1); else ring = &adev->gfx.gfx_ring[0 ]; r =amdgpu_ring_alloc (ring,gfx_v11_0_get_csb_size (adev));if (r) { -DRM_ERROR ("amdgpu: cp failed to lock ring (%d).\n" , r); +drm_err (&adev->ddev,"cp failed to lock ring (%d).\n" , r);return r; } ring = &adev->gfx.gfx_ring[1 ]; r =amdgpu_ring_alloc (ring,2 );if (r) { -DRM_ERROR ("amdgpu: cp failed to lock ring (%d).\n" , r); +drm_err (adev_to_drm (adev),"cp failed to lock ring (%d).\n" , r);return r; } }if (adev->enable_mes_kiq && adev->mes.kiq_hw_init) - r =amdgpu_mes_kiq_hw_init (adev); + r =amdgpu_mes_kiq_hw_init (adev,0 );else r =gfx_v11_0_kiq_resume (adev);if (r) adev->gfx.is_poweron = true;if (get_gb_addr_config (adev)) -DRM_WARN ("Invalid gb_addr_config !\n" ); +drm_warn (adev_to_drm (adev),"Invalid gb_addr_config !\n" );if (adev->firmware.load_type ==AMDGPU_FW_LOAD_PSP && adev->gfx.rs64_enable)if (amdgpu_gfx_disable_kcq (adev,0 ))DRM_ERROR ("KCQ disable failed\n" ); -amdgpu_mes_kiq_hw_fini (adev); +amdgpu_mes_kiq_hw_fini (adev,0 ); }if (amdgpu_sriov_vf (adev))return 0 ; } -static void gfx_v11_0_update_spm_vmid (struct amdgpu_device *adev,struct amdgpu_ring *ring,unsigned vmid) +static void gfx_v11_0_update_spm_vmid (struct amdgpu_device *adev,int xcc_id, +struct amdgpu_ring *ring,unsigned vmid) {u32 reg, pre_data, data;case IP_VERSION (11 ,5 ,1 ):case IP_VERSION (11 ,5 ,2 ):case IP_VERSION (11 ,5 ,3 ): +case IP_VERSION (11 ,5 ,4 ):WREG32_SOC15 (GC ,0 , regRLC_PG_DELAY_3,RLC_PG_DELAY_3_DEFAULT_GC_11_0_1 );break ;default :case IP_VERSION (11 ,5 ,1 ):case IP_VERSION (11 ,5 ,2 ):case IP_VERSION (11 ,5 ,3 ): +case IP_VERSION (11 ,5 ,4 ):if (!enable)amdgpu_gfx_off_ctrl (adev, false);case IP_VERSION (11 ,5 ,1 ):case IP_VERSION (11 ,5 ,2 ):case IP_VERSION (11 ,5 ,3 ): +case IP_VERSION (11 ,5 ,4 ):gfx_v11_0_update_gfx_clock_gating (adev, state ==AMD_CG_STATE_GATE );break ; {struct amdgpu_device *adev = ring->adev;u32 ref_and_mask, reg_mem_engine; -const struct nbio_hdp_flush_reg *nbio_hf_reg = adev->nbio.hdp_flush_reg; -if (ring->funcs->type ==AMDGPU_RING_TYPE_COMPUTE ) { -switch (ring->me) { -case 1 : - ref_and_mask = nbio_hf_reg->ref_and_mask_cp2 << ring->pipe; -break ; -case 2 : - ref_and_mask = nbio_hf_reg->ref_and_mask_cp6 << ring->pipe; -break ; -default : -return ; - } - reg_mem_engine =0 ; - }else { - ref_and_mask = nbio_hf_reg->ref_and_mask_cp0 << ring->pipe; - reg_mem_engine =1 ;/* pfp */ +if (!adev->gfx.funcs->get_hdp_flush_mask) { +dev_err (adev->dev,"%s: gfx hdp flush is not supported.\n" , __func__); +return ; } + adev->gfx.funcs->get_hdp_flush_mask (ring, &ref_and_mask, ®_mem_engine);gfx_v11_0_wait_reg_mem (ring, reg_mem_engine,0 ,1 , adev->nbio.funcs->get_hdp_flush_req_offset (adev), adev->nbio.funcs->get_hdp_flush_done_offset (adev), struct amdgpu_irq_src *source, struct amdgpu_iv_entry *entry) { -DRM_ERROR ("Illegal opcode in command stream \n" ); +DRM_ERROR ("Illegal opcode in command stream\n" );gfx_v11_0_handle_priv_fault (adev, entry);return 0 ; }amdgpu_ring_reset_helper_begin (ring, timedout_fence); - r =amdgpu_mes_reset_legacy_queue (ring->adev, ring, vmid, use_mmio); + r =amdgpu_mes_reset_legacy_queue (ring->adev, ring, vmid, use_mmio,0 );if (r) {dev_warn (adev->dev,"reset via MES failed and try pipe reset %d\n" , r);return r; } - r =amdgpu_mes_map_legacy_queue (adev, ring); + r =amdgpu_mes_map_legacy_queue (adev, ring,0 );if (r) {dev_err (adev->dev,"failed to remap kgq\n" );return r;amdgpu_ring_reset_helper_begin (ring, timedout_fence); - r =amdgpu_mes_reset_legacy_queue (ring->adev, ring, vmid, true); + r =amdgpu_mes_reset_legacy_queue (ring->adev, ring, vmid, true,0 );if (r) {dev_warn (adev->dev,"fail(%d) to reset kcq and try pipe reset\n" , r); r =gfx_v11_0_reset_compute_pipe (ring);dev_err (adev->dev,"fail to init kcq\n" );return r; } - r =amdgpu_mes_map_legacy_queue (adev, ring); + r =amdgpu_mes_map_legacy_queue (adev, ring,0 );if (r) {dev_err (adev->dev,"failed to remap kcq\n" );return r;if (!adev || !cu_info)return -EINVAL ; -amdgpu_gfx_parse_disable_cu (disable_masks,8 ,2 ); +amdgpu_gfx_parse_disable_cu (adev, disable_masks,8 ,2 );mutex_lock (&adev->grbm_idx_mutex);for (i =0 ; i < adev->gfx.config.max_shader_engines; i++) {
drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c +0 -0
@@@ -355,7 -355,8 +355,8 @@@ static void gfx_v12_0_kiq_unmap_queues(uint32_t eng_sel = ring->funcs->type ==AMDGPU_RING_TYPE_GFX ?4 :0 ;if (adev->enable_mes && !adev->gfx.kiq[0 ].ring.sched.ready) { -amdgpu_mes_unmap_legacy_queue (adev, ring, action, gpu_addr, seq); +amdgpu_mes_unmap_legacy_queue (adev, ring, action, + gpu_addr, seq,0 );return ; }WREG32 (scratch,0xCAFEDEAD ); r =amdgpu_ring_alloc (ring,5 );if (r) { -dev_err (adev->dev, -"amdgpu: cp failed to lock ring %d (%d).\n" , +drm_err (adev_to_drm (adev), +"cp failed to lock ring %d (%d).\n" , ring->idx, r);return r; } r =amdgpu_ib_get (adev,NULL ,16 ,AMDGPU_IB_POOL_DIRECT , &ib);if (r) { -dev_err (adev->dev,"amdgpu: failed to get ib (%ld).\n" , r); +drm_err (adev_to_drm (adev),"failed to get ib (%ld).\n" , r); goto err1; }/* init spm vmid with 0xf */ if (adev->gfx.rlc.funcs->update_spm_vmid) - adev->gfx.rlc.funcs->update_spm_vmid (adev,NULL ,0xf ); + adev->gfx.rlc.funcs->update_spm_vmid (adev,0 ,NULL ,0xf );return 0 ; }static void gfx_v12_0_get_gfx_shadow_info_nocheck (struct amdgpu_device *adev,struct amdgpu_gfx_shadow_info *shadow_info) { +/* for gfx */ shadow_info->shadow_size =MQD_SHADOW_BASE_SIZE ; shadow_info->shadow_alignment =MQD_SHADOW_BASE_ALIGNMENT ; shadow_info->csa_size =MQD_FWWORKAREA_SIZE ; shadow_info->csa_alignment =MQD_FWWORKAREA_ALIGNMENT ; +/* for compute */ + shadow_info->eop_size =GFX12_MEC_HPD_SIZE ; + shadow_info->eop_alignment =256 ; }static int gfx_v12_0_get_gfx_shadow_info (struct amdgpu_device *adev, .select_me_pipe_q = &gfx_v12_0_select_me_pipe_q, .update_perfmon_mgcg = &gfx_v12_0_update_perf_clk, .get_gfx_shadow_info = &gfx_v12_0_get_gfx_shadow_info, + .get_hdp_flush_mask = &amdgpu_gfx_get_hdp_flush_mask, }; static int gfx_v12_0_gpu_early_init(struct amdgpu_device *adev) }if (adev->enable_mes_kiq && adev->mes.kiq_hw_init) - r =amdgpu_mes_kiq_hw_init (adev); + r =amdgpu_mes_kiq_hw_init (adev,0 );else r =gfx_v12_0_kiq_resume (adev);if (r) adev->gfx.is_poweron = true;if (get_gb_addr_config (adev)) -DRM_WARN ("Invalid gb_addr_config !\n" ); +drm_warn (adev_to_drm (adev),"Invalid gb_addr_config !\n" );if (adev->firmware.load_type ==AMDGPU_FW_LOAD_PSP )gfx_v12_0_config_gfx_rs64 (adev);if (amdgpu_gfx_disable_kcq (adev,0 ))DRM_ERROR ("KCQ disable failed\n" ); -amdgpu_mes_kiq_hw_fini (adev); +amdgpu_mes_kiq_hw_fini (adev,0 ); }if (amdgpu_sriov_vf (adev)) { }static void gfx_v12_0_update_spm_vmid (struct amdgpu_device *adev, +int xcc_id,struct amdgpu_ring *ring,unsigned vmid) { {struct amdgpu_device *adev = ring->adev;u32 ref_and_mask, reg_mem_engine; -const struct nbio_hdp_flush_reg *nbio_hf_reg = adev->nbio.hdp_flush_reg; -if (ring->funcs->type ==AMDGPU_RING_TYPE_COMPUTE ) { -switch (ring->me) { -case 1 : - ref_and_mask = nbio_hf_reg->ref_and_mask_cp2 << ring->pipe; -break ; -case 2 : - ref_and_mask = nbio_hf_reg->ref_and_mask_cp6 << ring->pipe; -break ; -default : -return ; - } - reg_mem_engine =0 ; - }else { - ref_and_mask = nbio_hf_reg->ref_and_mask_cp0; - reg_mem_engine =1 ;/* pfp */ +if (!adev->gfx.funcs->get_hdp_flush_mask) { +dev_err (adev->dev,"%s: gfx hdp flush is not supported.\n" , __func__); +return ; } + adev->gfx.funcs->get_hdp_flush_mask (ring, &ref_and_mask, ®_mem_engine);gfx_v12_0_wait_reg_mem (ring, reg_mem_engine,0 ,1 , adev->nbio.funcs->get_hdp_flush_req_offset (adev), adev->nbio.funcs->get_hdp_flush_done_offset (adev), struct amdgpu_irq_src *source, struct amdgpu_iv_entry *entry) { -DRM_ERROR ("Illegal opcode in command stream \n" ); +DRM_ERROR ("Illegal opcode in command stream\n" );gfx_v12_0_handle_priv_fault (adev, entry);return 0 ; }amdgpu_ring_reset_helper_begin (ring, timedout_fence); - r =amdgpu_mes_reset_legacy_queue (ring->adev, ring, vmid, use_mmio); + r =amdgpu_mes_reset_legacy_queue (ring->adev, ring, vmid, use_mmio,0 );if (r) {dev_warn (adev->dev,"reset via MES failed and try pipe reset %d\n" , r); r =gfx_v12_reset_gfx_pipe (ring);return r; } - r =amdgpu_mes_map_legacy_queue (adev, ring); + r =amdgpu_mes_map_legacy_queue (adev, ring,0 );if (r) {dev_err (adev->dev,"failed to remap kgq\n" );return r;amdgpu_ring_reset_helper_begin (ring, timedout_fence); - r =amdgpu_mes_reset_legacy_queue (ring->adev, ring, vmid, true); + r =amdgpu_mes_reset_legacy_queue (ring->adev, ring, vmid, true,0 );if (r) {dev_warn (adev->dev,"fail(%d) to reset kcq and try pipe reset\n" , r); r =gfx_v12_0_reset_compute_pipe (ring);dev_err (adev->dev,"failed to init kcq\n" );return r; } - r =amdgpu_mes_map_legacy_queue (adev, ring); + r =amdgpu_mes_map_legacy_queue (adev, ring,0 );if (r) {dev_err (adev->dev,"failed to remap kcq\n" );return r;if (!adev || !cu_info)return -EINVAL ; -amdgpu_gfx_parse_disable_cu (disable_masks,8 ,2 ); +amdgpu_gfx_parse_disable_cu (adev, disable_masks,8 ,2 );mutex_lock (&adev->grbm_idx_mutex);for (i =0 ; i < adev->gfx.config.max_shader_engines; i++) {