LRU map compute/SDMA user ring ids to kernel ring ids v2
Subsystems (2)
PATCH 1/1 LRU map compute/SDMA user ring ids to kernel ring ids v2
V2 updates:
* Rebased
* All patches now have r-b
Second part of the split of the series:
Add support for high priority scheduling in amdgpu v8
These patches should be close to being good enough to land.
The first two patches are simple fixes I've ported from the ROCm branch. These still need review.
I've fixed all of Christian's comments for patch 04:
drm/amdgpu: implement lru amdgpu_queue_mgr policy for compute v4
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 20170421234836.18620-1-andresx7-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org
PATCH 1/6 drm/amdgpu: condense mqd programming sequence
The MQD structure matches the reg layout. Take advantage of this to simplify HQD programming.
Note that the ACTIVE field still needs to be programmed last.
--- drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 44 +++++------------- drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 84 +++++------------------------------ 2 files changed, 23 insertions(+), 105 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c +11 -33
@@ -3120,81 +3120,59 @@ static void gfx_v7_0_mqd_init(struct amdgpu_device *adev, mqd->cp_hqd_ib_rptr =RREG32 (mmCP_HQD_IB_RPTR); mqd->cp_hqd_persistent_state =RREG32 (mmCP_HQD_PERSISTENT_STATE); mqd->cp_hqd_sema_cmd =RREG32 (mmCP_HQD_SEMA_CMD); mqd->cp_hqd_msg_type =RREG32 (mmCP_HQD_MSG_TYPE); mqd->cp_hqd_atomic0_preop_lo =RREG32 (mmCP_HQD_ATOMIC0_PREOP_LO); mqd->cp_hqd_atomic0_preop_hi =RREG32 (mmCP_HQD_ATOMIC0_PREOP_HI); mqd->cp_hqd_atomic1_preop_lo =RREG32 (mmCP_HQD_ATOMIC1_PREOP_LO); mqd->cp_hqd_atomic1_preop_hi =RREG32 (mmCP_HQD_ATOMIC1_PREOP_HI); mqd->cp_hqd_pq_rptr =RREG32 (mmCP_HQD_PQ_RPTR); mqd->cp_hqd_quantum =RREG32 (mmCP_HQD_QUANTUM); mqd->cp_hqd_pipe_priority =RREG32 (mmCP_HQD_PIPE_PRIORITY); mqd->cp_hqd_queue_priority =RREG32 (mmCP_HQD_QUEUE_PRIORITY); mqd->cp_hqd_iq_rptr =RREG32 (mmCP_HQD_IQ_RPTR);/* activate the queue */ mqd->cp_hqd_active =1 ; }int gfx_v7_0_mqd_commit (struct amdgpu_device *adev,struct cik_mqd *mqd) { -u32 tmp; +uint32_t tmp; +uint32_t mqd_reg; +uint32_t *mqd_data; + +/* HQD registers extend from mmCP_MQD_BASE_ADDR to mmCP_MQD_CONTROL */ + mqd_data = &mqd->cp_mqd_base_addr_lo;/* disable wptr polling */ tmp =RREG32 (mmCP_PQ_WPTR_POLL_CNTL); tmp =REG_SET_FIELD (tmp,CP_PQ_WPTR_POLL_CNTL ,EN ,0 );WREG32 (mmCP_PQ_WPTR_POLL_CNTL, tmp); -/* program MQD field to HW */ -WREG32 (mmCP_MQD_BASE_ADDR, mqd->cp_mqd_base_addr_lo); -WREG32 (mmCP_MQD_BASE_ADDR_HI, mqd->cp_mqd_base_addr_hi); -WREG32 (mmCP_MQD_CONTROL, mqd->cp_mqd_control); -WREG32 (mmCP_HQD_PQ_BASE, mqd->cp_hqd_pq_base_lo); -WREG32 (mmCP_HQD_PQ_BASE_HI, mqd->cp_hqd_pq_base_hi); -WREG32 (mmCP_HQD_PQ_CONTROL, mqd->cp_hqd_pq_control); -WREG32 (mmCP_HQD_PQ_WPTR_POLL_ADDR, mqd->cp_hqd_pq_wptr_poll_addr_lo); -WREG32 (mmCP_HQD_PQ_WPTR_POLL_ADDR_HI, mqd->cp_hqd_pq_wptr_poll_addr_hi); -WREG32 (mmCP_HQD_PQ_RPTR_REPORT_ADDR, mqd->cp_hqd_pq_rptr_report_addr_lo); -WREG32 (mmCP_HQD_PQ_RPTR_REPORT_ADDR_HI, mqd->cp_hqd_pq_rptr_report_addr_hi); -WREG32 (mmCP_HQD_PQ_DOORBELL_CONTROL, mqd->cp_hqd_pq_doorbell_control); -WREG32 (mmCP_HQD_PQ_WPTR, mqd->cp_hqd_pq_wptr); -WREG32 (mmCP_HQD_VMID, mqd->cp_hqd_vmid); - -WREG32 (mmCP_HQD_IB_CONTROL, mqd->cp_hqd_ib_control); -WREG32 (mmCP_HQD_IB_BASE_ADDR, mqd->cp_hqd_ib_base_addr_lo); -WREG32 (mmCP_HQD_IB_BASE_ADDR_HI, mqd->cp_hqd_ib_base_addr_hi); -WREG32 (mmCP_HQD_IB_RPTR, mqd->cp_hqd_ib_rptr); -WREG32 (mmCP_HQD_PERSISTENT_STATE, mqd->cp_hqd_persistent_state); -WREG32 (mmCP_HQD_SEMA_CMD, mqd->cp_hqd_sema_cmd); -WREG32 (mmCP_HQD_MSG_TYPE, mqd->cp_hqd_msg_type); -WREG32 (mmCP_HQD_ATOMIC0_PREOP_LO, mqd->cp_hqd_atomic0_preop_lo); -WREG32 (mmCP_HQD_ATOMIC0_PREOP_HI, mqd->cp_hqd_atomic0_preop_hi); -WREG32 (mmCP_HQD_ATOMIC1_PREOP_LO, mqd->cp_hqd_atomic1_preop_lo); -WREG32 (mmCP_HQD_ATOMIC1_PREOP_HI, mqd->cp_hqd_atomic1_preop_hi); -WREG32 (mmCP_HQD_PQ_RPTR, mqd->cp_hqd_pq_rptr); -WREG32 (mmCP_HQD_QUANTUM, mqd->cp_hqd_quantum); -WREG32 (mmCP_HQD_PIPE_PRIORITY, mqd->cp_hqd_pipe_priority); -WREG32 (mmCP_HQD_QUEUE_PRIORITY, mqd->cp_hqd_queue_priority); -WREG32 (mmCP_HQD_IQ_RPTR, mqd->cp_hqd_iq_rptr); +/* program all HQD registers */ +for (mqd_reg = mmCP_HQD_VMID; mqd_reg <= mmCP_MQD_CONTROL; mqd_reg++) +WREG32 (mqd_reg, mqd_data[mqd_reg - mmCP_MQD_BASE_ADDR]);/* activate the HQD */ -WREG32 (mmCP_HQD_ACTIVE, mqd->cp_hqd_active); +for (mqd_reg = mmCP_MQD_BASE_ADDR; mqd_reg <= mmCP_HQD_ACTIVE; mqd_reg++) +WREG32 (mqd_reg, mqd_data[mqd_reg - mmCP_MQD_BASE_ADDR]);return 0 ; }static int gfx_v7_0_compute_queue_init (struct amdgpu_device *adev,int ring_id) {int r;u64 mqd_gpu_addr;struct cik_mqd *mqd;struct amdgpu_ring *ring = &adev->gfx.compute_ring[ring_id];if (ring->mqd_obj ==NULL ) { r =amdgpu_bo_create (adev,sizeof (struct cik_mqd ),PAGE_SIZE , true,AMDGPU_GEM_DOMAIN_GTT ,0 ,NULL ,NULL , &ring->mqd_obj);if (r) {dev_warn (adev->dev,"(%d) create MQD bo failed\n" , r);return r;
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +12 -72
128 lines not on this page · raw message
Signature · 6 lines
2.9.3 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 2/6 drm/amdgpu: workaround tonga HW bug in HQD programming sequence
In reply to a message not in the archiveTonga based asics may experience hangs when an HQD's EOP parameters are modified.
Workaround this HW issue by avoiding writes to these registers for tonga asics.
Based on the following ROCm commit:
2a0fb8 - drm/amdgpu: Synchronize KFD HQD load protocol with CP scheduler
From the ROCm git repository:
https://github.com/RadeonOpenCompute/ROCK-Kernel-Driver.git
--- drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +15 -1
@@ -5034,41 +5034,55 @@ static int gfx_v8_0_mqd_init(struct amdgpu_ring *ring)/* activate the queue */ mqd->cp_hqd_active =1 ;return 0 ; }int gfx_v8_0_mqd_commit (struct amdgpu_device *adev,struct vi_mqd *mqd) {uint32_t mqd_reg;uint32_t *mqd_data;/* HQD registers extend from mmCP_MQD_BASE_ADDR to mmCP_HQD_ERROR */ mqd_data = &mqd->cp_mqd_base_addr_lo;/* disable wptr polling */ WREG32_FIELD (CP_PQ_WPTR_POLL_CNTL ,EN ,0 );/* program all HQD registers */ -for (mqd_reg = mmCP_HQD_VMID; mqd_reg <= mmCP_HQD_ERROR; mqd_reg++) +for (mqd_reg = mmCP_HQD_VMID; mqd_reg <= mmCP_HQD_EOP_CONTROL; mqd_reg++) +WREG32 (mqd_reg, mqd_data[mqd_reg - mmCP_MQD_BASE_ADDR]); + +/* Tonga errata: EOP RPTR/WPTR should be left unmodified. +* This is safe since EOP RPTR==WPTR for any inactive HQD +* on ASICs that do not support context-save. +* EOP writes/reads can start anywhere in the ring. +*/ +if (adev->asic_type !=CHIP_TONGA ) { +WREG32 (mmCP_HQD_EOP_RPTR, mqd->cp_hqd_eop_rptr); +WREG32 (mmCP_HQD_EOP_WPTR, mqd->cp_hqd_eop_wptr); +WREG32 (mmCP_HQD_EOP_WPTR_MEM, mqd->cp_hqd_eop_wptr_mem); + } + +for (mqd_reg = mmCP_HQD_EOP_EVENTS; mqd_reg <= mmCP_HQD_ERROR; mqd_reg++)WREG32 (mqd_reg, mqd_data[mqd_reg - mmCP_MQD_BASE_ADDR]);/* activate the HQD */ for (mqd_reg = mmCP_MQD_BASE_ADDR; mqd_reg <= mmCP_HQD_ACTIVE; mqd_reg++)WREG32 (mqd_reg, mqd_data[mqd_reg - mmCP_MQD_BASE_ADDR]);return 0 ; }static int gfx_v8_0_kiq_init_queue (struct amdgpu_ring *ring) {int r =0 ;struct amdgpu_device *adev = ring->adev;struct vi_mqd *mqd = ring->mqd_ptr;int mqd_idx =AMDGPU_MAX_COMPUTE_RINGS ;gfx_v8_0_kiq_setting (ring);if (adev->gfx.in_reset) {/* for GPU_RESET case */ /* reset MQD to a clean status */
Signature · 6 lines
2.9.3 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/6 drm/amdgpu: untie user ring ids from kernel ring ids v4
In reply to a message not in the archiveAdd amdgpu_queue_mgr, a mechanism that allows disjointing usermode's ring ids from the kernel's ring ids.
The queue manager maintains a per-file descriptor map of user ring ids to amdgpu_ring pointers. Once a map is created it is permanent (this is required to maintain FIFO execution guarantees for a context's ring).
Different queue map policies can be configured for each HW IP. Currently all HW IPs use the identity mapper, i.e. kernel ring id is equal to the user ring id.
The purpose of this mechanism is to distribute the load across multiple queues more effectively for HW IPs that support multiple rings. Userspace clients are unable to check whether a specific resource is in use by a different client. Therefore, it is up to the kernel driver to make the optimal choice.
v2: remove amdgpu_queue_mapper_funcs
v3: made amdgpu_queue_mgr per context instead of per-fd
v4: add context_put on error paths
--- drivers/gpu/drm/amd/amdgpu/Makefile | 3 +- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 27 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 117 +++---------- drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 6 + drivers/gpu/drm/amd/amdgpu/amdgpu_queue_mgr.c | 230 ++++++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 45 +++++ drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 2 + 7 files changed, 335 insertions(+), 95 deletions(-) create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_queue_mgr.c
drivers/gpu/drm/amd/amdgpu/Makefile +2 -1
@@ -7,41 +7,42 @@ FULL_AMD_PATH=$(src)/.. ccflags-y := -Iinclude/drm -I$(FULL_AMD_PATH)/include/asic_reg \ -I$(FULL_AMD_PATH)/include \ -I$(FULL_AMD_PATH)/amdgpu \ -I$(FULL_AMD_PATH)/scheduler \ -I$(FULL_AMD_PATH)/powerplay/inc \ -I$(FULL_AMD_PATH)/acp/include amdgpu-y := amdgpu_drv.o # add KMS driver amdgpu-y += amdgpu_device.o amdgpu_kms.o \ amdgpu_atombios.o atombios_crtc.o amdgpu_connectors.o \ atom.o amdgpu_fence.o amdgpu_ttm.o amdgpu_object.o amdgpu_gart.o \ amdgpu_encoders.o amdgpu_display.o amdgpu_i2c.o \ amdgpu_fb.o amdgpu_gem.o amdgpu_ring.o \ amdgpu_cs.o amdgpu_bios.o amdgpu_benchmark.o amdgpu_test.o \ amdgpu_pm.o atombios_dp.o amdgpu_afmt.o amdgpu_trace_points.o \ atombios_encoders.o amdgpu_sa.o atombios_i2c.o \ amdgpu_prime.o amdgpu_vm.o amdgpu_ib.o amdgpu_pll.o \ amdgpu_ucode.o amdgpu_bo_list.o amdgpu_ctx.o amdgpu_sync.o \ - amdgpu_gtt_mgr.o amdgpu_vram_mgr.o amdgpu_virt.o amdgpu_atomfirmware.o + amdgpu_gtt_mgr.o amdgpu_vram_mgr.o amdgpu_virt.o amdgpu_atomfirmware.o \ + amdgpu_queue_mgr.o # add asic specific block amdgpu-$(CONFIG_DRM_AMDGPU_CIK)+= cik.o cik_ih.o kv_smc.o kv_dpm.o \ ci_smc.o ci_dpm.o dce_v8_0.o gfx_v7_0.o cik_sdma.o uvd_v4_2.o vce_v2_0.o \ amdgpu_amdkfd_gfx_v7.o amdgpu-$(CONFIG_DRM_AMDGPU_SI)+= si.o gmc_v6_0.o gfx_v6_0.o si_ih.o si_dma.o dce_v6_0.o si_dpm.o si_smc.o amdgpu-y += \ vi.o mxgpu_vi.o nbio_v6_1.o soc15.o mxgpu_ai.o # add GMC block amdgpu-y += \ gmc_v7_0.o \ gmc_v8_0.o \ gfxhub_v1_0.o mmhub_v1_0.o gmc_v9_0.o # add IH block amdgpu-y += \ amdgpu_irq.o \
drivers/gpu/drm/amd/amdgpu/amdgpu.h +24 -3
@@ -756,52 +756,76 @@ struct amdgpu_ib {uint32_t length_dw;uint64_t gpu_addr;uint32_t *ptr;uint32_t flags; };extern const struct amd_sched_backend_ops amdgpu_sched_ops;int amdgpu_job_alloc (struct amdgpu_device *adev,unsigned num_ibs,struct amdgpu_job **job,struct amdgpu_vm *vm);int amdgpu_job_alloc_with_ib (struct amdgpu_device *adev,unsigned size,struct amdgpu_job **job);void amdgpu_job_free_resources (struct amdgpu_job *job);void amdgpu_job_free (struct amdgpu_job *job);int amdgpu_job_submit (struct amdgpu_job *job,struct amdgpu_ring *ring,struct amd_sched_entity *entity,void *owner,struct dma_fence **f);/* +* Queue manager +*/ +struct amdgpu_queue_mapper { +int hw_ip; +struct mutex lock; +/* protected by lock */ +struct amdgpu_ring *queue_map[AMDGPU_MAX_RINGS ]; +}; + +struct amdgpu_queue_mgr { +struct amdgpu_queue_mapper mapper[AMDGPU_MAX_IP_NUM ]; +}; + +int amdgpu_queue_mgr_init (struct amdgpu_device *adev, +struct amdgpu_queue_mgr *mgr); +int amdgpu_queue_mgr_fini (struct amdgpu_device *adev, +struct amdgpu_queue_mgr *mgr); +int amdgpu_queue_mgr_map (struct amdgpu_device *adev, +struct amdgpu_queue_mgr *mgr, +int hw_ip,int instance,int ring, +struct amdgpu_ring **out_ring); + +/* * context related structures */ struct amdgpu_ctx_ring {uint64_t sequence;struct dma_fence **fences;struct amd_sched_entity entity; };struct amdgpu_ctx {struct kref refcount;struct amdgpu_device *adev; +struct amdgpu_queue_mgr queue_mgr;unsigned reset_counter;spinlock_t ring_lock;struct dma_fence **fences;struct amdgpu_ctx_ring rings[AMDGPU_MAX_RINGS ];bool preamble_presented; };struct amdgpu_ctx_mgr {struct amdgpu_device *adev;struct mutex lock;/* protected by lock */ struct idr ctx_handles; };struct amdgpu_ctx *amdgpu_ctx_get (struct amdgpu_fpriv *fpriv,uint32_t id);int amdgpu_ctx_put (struct amdgpu_ctx *ctx);uint64_t amdgpu_ctx_add_fence (struct amdgpu_ctx *ctx,struct amdgpu_ring *ring,struct dma_fence *fence); struct dma_fence *amdgpu_ctx_get_fence(struct amdgpu_ctx *ctx,
@@ -1865,43 +1889,40 @@ static inline bool amdgpu_is_mec_queue_enabled(struct amdgpu_device *adev,#define amdgpu_display_page_flip_get_scanoutpos (adev, crtc, vbl, pos) (adev)->mode_info.funcs->page_flip_get_scanoutpos((adev), (crtc), (vbl), (pos))#define amdgpu_display_add_encoder (adev, e, s, c) (adev)->mode_info.funcs->add_encoder((adev), (e), (s), (c))#define amdgpu_display_add_connector (adev, ci, sd, ct, ib, coi, h, r) (adev)->mode_info.funcs->add_connector((adev), (ci), (sd), (ct), (ib), (coi), (h), (r))#define amdgpu_display_stop_mc_access (adev, s) (adev)->mode_info.funcs->stop_mc_access((adev), (s))#define amdgpu_display_resume_mc_access (adev, s) (adev)->mode_info.funcs->resume_mc_access((adev), (s))#define amdgpu_emit_copy_buffer (adev, ib, s, d, b) (adev)->mman.buffer_funcs->emit_copy_buffer((ib), (s), (d), (b))#define amdgpu_emit_fill_buffer (adev, ib, s, d, b) (adev)->mman.buffer_funcs->emit_fill_buffer((ib), (s), (d), (b))#define amdgpu_gfx_get_gpu_clock_counter (adev) (adev)->gfx.funcs->get_gpu_clock_counter((adev))#define amdgpu_gfx_select_se_sh (adev, se, sh, instance) (adev)->gfx.funcs->select_se_sh((adev), (se), (sh), (instance))#define amdgpu_gds_switch (adev, r, v, d, w, a) (adev)->gds.funcs->patch_gds_switch((r), (v), (d), (w), (a))#define amdgpu_psp_check_fw_loading_status (adev, i) (adev)->firmware.funcs->check_fw_loading_status((adev), (i))/* Common functions */ int amdgpu_gpu_reset (struct amdgpu_device *adev);bool amdgpu_need_backup (struct amdgpu_device *adev);void amdgpu_pci_config_reset (struct amdgpu_device *adev);bool amdgpu_need_post (struct amdgpu_device *adev);void amdgpu_update_display_priority (struct amdgpu_device *adev);int amdgpu_cs_parser_init (struct amdgpu_cs_parser *p,void *data); -int amdgpu_cs_get_ring (struct amdgpu_device *adev,u32 ip_type, -u32 ip_instance,u32 ring, -struct amdgpu_ring **out_ring);void amdgpu_cs_report_moved_bytes (struct amdgpu_device *adev,u64 num_bytes);void amdgpu_ttm_placement_from_domain (struct amdgpu_bo *abo,u32 domain);bool amdgpu_ttm_bo_is_amdgpu_bo (struct ttm_buffer_object *bo);int amdgpu_ttm_tt_get_user_pages (struct ttm_tt *ttm,struct page **pages);int amdgpu_ttm_tt_set_userptr (struct ttm_tt *ttm,uint64_t addr,uint32_t flags);bool amdgpu_ttm_tt_has_userptr (struct ttm_tt *ttm);struct mm_struct *amdgpu_ttm_tt_get_usermm (struct ttm_tt *ttm);bool amdgpu_ttm_tt_affect_userptr (struct ttm_tt *ttm,unsigned long start,unsigned long end);bool amdgpu_ttm_tt_userptr_invalidated (struct ttm_tt *ttm,int *last_invalidated);bool amdgpu_ttm_tt_is_readonly (struct ttm_tt *ttm);uint64_t amdgpu_ttm_tt_pte_flags (struct amdgpu_device *adev,struct ttm_tt *ttm,struct ttm_mem_reg *mem);void amdgpu_vram_location (struct amdgpu_device *adev,struct amdgpu_mc *mc,u64 base);void amdgpu_gtt_location (struct amdgpu_device *adev,struct amdgpu_mc *mc);void amdgpu_ttm_set_active_vram_size (struct amdgpu_device *adev,u64 size);int amdgpu_ttm_init (struct amdgpu_device *adev);void amdgpu_ttm_fini (struct amdgpu_device *adev);
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +26 -91
324 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c +6 -0
@@ -41,68 +41,74 @@ static int amdgpu_ctx_init(struct amdgpu_device *adev, struct amdgpu_ctx *ctx)for (i =0 ; i <AMDGPU_MAX_RINGS ; ++i) { ctx->rings[i].sequence =1 ; ctx->rings[i].fences = &ctx->fences[amdgpu_sched_jobs * i]; } ctx->reset_counter =atomic_read (&adev->gpu_reset_counter);/* create context entity for each ring */ for (i =0 ; i < adev->num_rings; i++) {struct amdgpu_ring *ring = adev->rings[i];struct amd_sched_rq *rq; rq = &ring->sched.sched_rq[AMD_SCHED_PRIORITY_NORMAL ]; r =amd_sched_entity_init (&ring->sched, &ctx->rings[i].entity, rq, amdgpu_sched_jobs);if (r) goto failed; } + r =amdgpu_queue_mgr_init (adev, &ctx->queue_mgr); +if (r) + goto failed; +return 0 ; failed:for (j =0 ; j < i; j++)amd_sched_entity_fini (&adev->rings[j]->sched, &ctx->rings[j].entity);kfree (ctx->fences); ctx->fences =NULL ;return r; }static void amdgpu_ctx_fini (struct amdgpu_ctx *ctx) {struct amdgpu_device *adev = ctx->adev;unsigned i, j;if (!adev)return ;for (i =0 ; i <AMDGPU_MAX_RINGS ; ++i)for (j =0 ; j < amdgpu_sched_jobs; ++j)dma_fence_put (ctx->rings[i].fences[j]);kfree (ctx->fences); ctx->fences =NULL ;for (i =0 ; i < adev->num_rings; i++)amd_sched_entity_fini (&adev->rings[i]->sched, &ctx->rings[i].entity); + +amdgpu_queue_mgr_fini (adev, &ctx->queue_mgr); }static int amdgpu_ctx_alloc (struct amdgpu_device *adev,struct amdgpu_fpriv *fpriv,uint32_t *id) {struct amdgpu_ctx_mgr *mgr = &fpriv->ctx_mgr;struct amdgpu_ctx *ctx;int r; ctx =kmalloc (sizeof (*ctx),GFP_KERNEL );if (!ctx)return -ENOMEM ;mutex_lock (&mgr->lock); r =idr_alloc (&mgr->ctx_handles, ctx,1 ,0 ,GFP_KERNEL );if (r <0 ) {mutex_unlock (&mgr->lock);kfree (ctx);return r;
drivers/gpu/drm/amd/amdgpu/amdgpu_queue_mgr.c new file +230 -0
230 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c +45 -0
85 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h +2 -0
@@ -168,38 +168,40 @@ struct amdgpu_ring {u32 queue;struct amdgpu_bo *mqd_obj;uint64_t mqd_gpu_addr;void *mqd_ptr;uint64_t eop_gpu_addr;u32 doorbell_index;bool use_doorbell;unsigned wptr_offs;unsigned fence_offs;uint64_t current_ctx;char name[16 ];unsigned cond_exe_offs;u64 cond_exe_gpu_addr;volatile u32 *cond_exe_cpu_addr;unsigned vm_inv_eng;#if defined(CONFIG_DEBUG_FS )struct dentry *ent;#endif }; +int amdgpu_ring_is_valid_index (struct amdgpu_device *adev, +int hw_ip,int ring);int amdgpu_ring_alloc (struct amdgpu_ring *ring,unsigned ndw);void amdgpu_ring_insert_nop (struct amdgpu_ring *ring,uint32_t count);void amdgpu_ring_generic_pad_ib (struct amdgpu_ring *ring,struct amdgpu_ib *ib);void amdgpu_ring_commit (struct amdgpu_ring *ring);void amdgpu_ring_undo (struct amdgpu_ring *ring);int amdgpu_ring_init (struct amdgpu_device *adev,struct amdgpu_ring *ring,unsigned ring_size,struct amdgpu_irq_src *irq_src,unsigned irq_type);void amdgpu_ring_fini (struct amdgpu_ring *ring);static inline void amdgpu_ring_clear_ring (struct amdgpu_ring *ring) {int i =0 ;while (i <= ring->buf_mask) ring->ring[i++] = ring->funcs->nop; }#endif
Signature · 6 lines
2.9.3 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 4/6 drm/amdgpu: implement lru amdgpu_queue_mgr policy for compute v4
In reply to a message not in the archiveUse an LRU policy to map usermode rings to HW compute queues.
Most compute clients use one queue, and usually the first queue available. This results in poor pipe/queue work distribution when multiple compute apps are running. In most cases pipe 0 queue 0 is the only queue that gets used.
In order to better distribute work across multiple HW queues, we adopt a policy to map the usermode ring ids to the LRU HW queue.
This fixes a large majority of multi-app compute workloads sharing the same HW queue, even though 7 other queues are available.
v2: use ring->funcs->type instead of ring->hw_ip
v3: remove amdgpu_queue_mapper_funcs
v4: change ring_lru_list_lock to spinlock, grab only once in lru_get()
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 3 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 3 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_queue_mgr.c | 38 +++++++++++++++- drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 63 +++++++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 4 ++ 5 files changed, 110 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +3 -0
@@ -1616,40 +1616,43 @@ struct amdgpu_device {int num_ip_blocks;struct mutex mn_lock;DECLARE_HASHTABLE (mn_hash,7 );/* tracking pinned memory */ u64 vram_pin_size;u64 invisible_pin_size;u64 gart_pin_size;/* amdkfd interface */ struct kfd_dev *kfd;struct amdgpu_virt virt;/* link all shadow bo */ struct list_head shadow_list;struct mutex shadow_list_lock;/* link all gtt */ spinlock_t gtt_list_lock;struct list_head gtt_list; +/* keep an lru list of rings by HW IP */ +struct list_head ring_lru_list; +spinlock_t ring_lru_list_lock;/* record hw reset is performed */ bool has_hw_reset; };static inline struct amdgpu_device *amdgpu_ttm_adev (struct ttm_bo_device *bdev) { return container_of(bdev, struct amdgpu_device, mman.bdev); }bool amdgpu_device_is_px (struct drm_device *dev);int amdgpu_device_init (struct amdgpu_device *adev,struct drm_device *ddev,struct pci_dev *pdev,uint32_t flags);void amdgpu_device_fini (struct amdgpu_device *adev);int amdgpu_gpu_wait_for_idle (struct amdgpu_device *adev); uint32_t amdgpu_mm_rreg(struct amdgpu_device *adev, uint32_t reg,
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +3 -0
@@ -1864,40 +1864,43 @@ int amdgpu_device_init(struct amdgpu_device *adev,amdgpu_check_arguments (adev);/* Registers mapping */ /* TODO: block userspace mapping of io register */ spin_lock_init (&adev->mmio_idx_lock);spin_lock_init (&adev->smc_idx_lock);spin_lock_init (&adev->pcie_idx_lock);spin_lock_init (&adev->uvd_ctx_idx_lock);spin_lock_init (&adev->didt_idx_lock);spin_lock_init (&adev->gc_cac_idx_lock);spin_lock_init (&adev->audio_endpt_idx_lock);spin_lock_init (&adev->mm_stats.lock);INIT_LIST_HEAD (&adev->shadow_list);mutex_init (&adev->shadow_list_lock);INIT_LIST_HEAD (&adev->gtt_list);spin_lock_init (&adev->gtt_list_lock); +INIT_LIST_HEAD (&adev->ring_lru_list); +spin_lock_init (&adev->ring_lru_list_lock); +if (adev->asic_type >=CHIP_BONAIRE ) { adev->rmmio_base =pci_resource_start (adev->pdev,5 ); adev->rmmio_size =pci_resource_len (adev->pdev,5 ); }else { adev->rmmio_base =pci_resource_start (adev->pdev,2 ); adev->rmmio_size =pci_resource_len (adev->pdev,2 ); } adev->rmmio =ioremap (adev->rmmio_base, adev->rmmio_size);if (adev->rmmio ==NULL ) {return -ENOMEM ; }DRM_INFO ("register mmio base: 0x%08X\n" , (uint32_t )adev->rmmio_base);DRM_INFO ("register mmio size: %u\n" , (unsigned )adev->rmmio_size);if (adev->asic_type >=CHIP_BONAIRE )/* doorbell bar mapping */ amdgpu_doorbell_init (adev);/* io port mapping */
drivers/gpu/drm/amd/amdgpu/amdgpu_queue_mgr.c +37 -1
@@ -74,40 +74,74 @@ static int amdgpu_identity_map(struct amdgpu_device *adev, *out_ring = &adev->gfx.compute_ring[ring];break ;case AMDGPU_HW_IP_DMA : *out_ring = &adev->sdma.instance[ring].ring;break ;case AMDGPU_HW_IP_UVD : *out_ring = &adev->uvd.ring;break ;case AMDGPU_HW_IP_VCE : *out_ring = &adev->vce.ring[ring];break ;default : *out_ring =NULL ;DRM_ERROR ("unknown HW IP type: %d\n" , mapper->hw_ip);return -EINVAL ; }return amdgpu_update_cached_map (mapper, ring, *out_ring); } +static enum amdgpu_ring_type amdgpu_hw_ip_to_ring_type (int hw_ip) +{ +switch (hw_ip) { +case AMDGPU_HW_IP_GFX : +return AMDGPU_RING_TYPE_GFX ; +case AMDGPU_HW_IP_COMPUTE : +return AMDGPU_RING_TYPE_COMPUTE ; +case AMDGPU_HW_IP_DMA : +return AMDGPU_RING_TYPE_SDMA ; +case AMDGPU_HW_IP_UVD : +return AMDGPU_RING_TYPE_UVD ; +case AMDGPU_HW_IP_VCE : +return AMDGPU_RING_TYPE_VCE ; +default : +DRM_ERROR ("Invalid HW IP specified %d\n" , hw_ip); +return -1 ; + } +} + +static int amdgpu_lru_map (struct amdgpu_device *adev, +struct amdgpu_queue_mapper *mapper, +int user_ring, +struct amdgpu_ring **out_ring) +{ +int r; +int ring_type =amdgpu_hw_ip_to_ring_type (mapper->hw_ip); + + r =amdgpu_ring_lru_get (adev, ring_type, out_ring); +if (r) +return r; + +return amdgpu_update_cached_map (mapper, user_ring, *out_ring); +} +/** * amdgpu_queue_mgr_init - init an amdgpu_queue_mgr struct * * @adev: amdgpu_device pointer * @mgr: amdgpu_queue_mgr structure holding queue information * * Initialize the the selected @mgr (all asics). * * Returns 0 on success, error on failure. */ int amdgpu_queue_mgr_init (struct amdgpu_device *adev,struct amdgpu_queue_mgr *mgr) {int i, r;if (!adev || !mgr)return -EINVAL ;memset (mgr,0 ,sizeof (*mgr));
@@ -195,36 +229,38 @@ int amdgpu_queue_mgr_map(struct amdgpu_device *adev,return -EINVAL ; }if (ring >= ip_num_rings) {DRM_ERROR ("Ring index:%d exceeds maximum:%d for ip:%d\n" , ring, ip_num_rings, hw_ip);return -EINVAL ; }mutex_lock (&mapper->lock); *out_ring =amdgpu_get_cached_map (mapper, ring);if (*out_ring) {/* cache hit */ r =0 ; goto out_unlock; }switch (mapper->hw_ip) {case AMDGPU_HW_IP_GFX : -case AMDGPU_HW_IP_COMPUTE :case AMDGPU_HW_IP_DMA :case AMDGPU_HW_IP_UVD :case AMDGPU_HW_IP_VCE : r =amdgpu_identity_map (adev, mapper, ring, out_ring);break ; +case AMDGPU_HW_IP_COMPUTE : + r =amdgpu_lru_map (adev, mapper, ring, out_ring); +break ;default : *out_ring =NULL ; r = -EINVAL ;DRM_ERROR ("unknown HW IP type: %d\n" , mapper->hw_ip); } out_unlock:mutex_unlock (&mapper->lock);return r; }
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c +63 -0
183 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h +4 -0
@@ -132,40 +132,41 @@ struct amdgpu_ring_funcs {void (*insert_nop)(struct amdgpu_ring *ring,uint32_t count);void (*insert_end)(struct amdgpu_ring *ring);/* pad the indirect buffer to the necessary number of dw */ void (*pad_ib)(struct amdgpu_ring *ring,struct amdgpu_ib *ib);unsigned (*init_cond_exec)(struct amdgpu_ring *ring);void (*patch_cond_exec)(struct amdgpu_ring *ring,unsigned offset);/* note usage for clock and power gating */ void (*begin_use)(struct amdgpu_ring *ring);void (*end_use)(struct amdgpu_ring *ring);void (*emit_switch_buffer) (struct amdgpu_ring *ring);void (*emit_cntxcntl) (struct amdgpu_ring *ring,uint32_t flags);void (*emit_rreg)(struct amdgpu_ring *ring,uint32_t reg);void (*emit_wreg)(struct amdgpu_ring *ring,uint32_t reg,uint32_t val); };struct amdgpu_ring {struct amdgpu_device *adev;const struct amdgpu_ring_funcs *funcs;struct amdgpu_fence_driver fence_drv;struct amd_gpu_scheduler sched; +struct list_head lru_list;struct amdgpu_bo *ring_obj;volatile uint32_t *ring;unsigned rptr_offs;u64 wptr;u64 wptr_old;unsigned ring_size;unsigned max_dw;int count_dw;uint64_t gpu_addr;uint64_t ptr_mask;uint32_t buf_mask;bool ready;u32 idx;u32 me;u32 pipe;u32 queue;struct amdgpu_bo *mqd_obj;uint64_t mqd_gpu_addr;void *mqd_ptr;
@@ -179,29 +180,32 @@ struct amdgpu_ring {unsigned cond_exe_offs;u64 cond_exe_gpu_addr;volatile u32 *cond_exe_cpu_addr;unsigned vm_inv_eng;#if defined(CONFIG_DEBUG_FS )struct dentry *ent;#endif };int amdgpu_ring_is_valid_index (struct amdgpu_device *adev,int hw_ip,int ring);int amdgpu_ring_alloc (struct amdgpu_ring *ring,unsigned ndw);void amdgpu_ring_insert_nop (struct amdgpu_ring *ring,uint32_t count);void amdgpu_ring_generic_pad_ib (struct amdgpu_ring *ring,struct amdgpu_ib *ib);void amdgpu_ring_commit (struct amdgpu_ring *ring);void amdgpu_ring_undo (struct amdgpu_ring *ring);int amdgpu_ring_init (struct amdgpu_device *adev,struct amdgpu_ring *ring,unsigned ring_size,struct amdgpu_irq_src *irq_src,unsigned irq_type);void amdgpu_ring_fini (struct amdgpu_ring *ring); +int amdgpu_ring_lru_get (struct amdgpu_device *adev,int hw_ip, +struct amdgpu_ring **ring); +void amdgpu_ring_lru_touch (struct amdgpu_device *adev,struct amdgpu_ring *ring);static inline void amdgpu_ring_clear_ring (struct amdgpu_ring *ring) {int i =0 ;while (i <= ring->buf_mask) ring->ring[i++] = ring->funcs->nop; }#endif
Signature · 6 lines
2.9.3 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 5/6 drm/amdgpu: guarantee bijective mapping of ring ids for LRU v3
In reply to a message not in the archiveDepending on usage patterns, the current LRU policy may create a non-injective mapping between userspace ring ids and kernel rings.
This behaviour is undesired as apps that attempt to fill all HW blocks would be unable to reach some of them.
This change forces the LRU policy to create bijective mappings only.
v2: compress ring_blacklist
v3: simplify amdgpu_ring_is_blacklisted() logic
--- drivers/gpu/drm/amd/amdgpu/amdgpu_queue_mgr.c | 16 +++++++++++-- drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 33 +++++++++++++++++++++------ drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 4 ++-- 3 files changed, 42 insertions(+), 11 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_queue_mgr.c +14 -2
@@ -98,44 +98,56 @@ static enum amdgpu_ring_type amdgpu_hw_ip_to_ring_type(int hw_ip)return AMDGPU_RING_TYPE_GFX ;case AMDGPU_HW_IP_COMPUTE :return AMDGPU_RING_TYPE_COMPUTE ;case AMDGPU_HW_IP_DMA :return AMDGPU_RING_TYPE_SDMA ;case AMDGPU_HW_IP_UVD :return AMDGPU_RING_TYPE_UVD ;case AMDGPU_HW_IP_VCE :return AMDGPU_RING_TYPE_VCE ;default :DRM_ERROR ("Invalid HW IP specified %d\n" , hw_ip);return -1 ; } }static int amdgpu_lru_map (struct amdgpu_device *adev,struct amdgpu_queue_mapper *mapper,int user_ring,struct amdgpu_ring **out_ring) { -int r; +int r, i, j;int ring_type =amdgpu_hw_ip_to_ring_type (mapper->hw_ip); +int ring_blacklist[AMDGPU_MAX_RINGS ]; +struct amdgpu_ring *ring; - r =amdgpu_ring_lru_get (adev, ring_type, out_ring); +/* 0 is a valid ring index, so initialize to -1 */ +memset (ring_blacklist,0xff ,sizeof (ring_blacklist)); + +for (i =0 , j =0 ; i <AMDGPU_MAX_RINGS ; i++) { + ring = mapper->queue_map[i]; +if (ring) + ring_blacklist[j++] = ring->idx; + } + + r =amdgpu_ring_lru_get (adev, ring_type, ring_blacklist, + j, out_ring);if (r)return r;return amdgpu_update_cached_map (mapper, user_ring, *out_ring); }/** * amdgpu_queue_mgr_init - init an amdgpu_queue_mgr struct * * @adev: amdgpu_device pointer * @mgr: amdgpu_queue_mgr structure holding queue information * * Initialize the the selected @mgr (all asics). * * Returns 0 on success, error on failure. */ int amdgpu_queue_mgr_init (struct amdgpu_device *adev,struct amdgpu_queue_mgr *mgr) {int i, r;
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c +26 -7
@@ -333,66 +333,85 @@ void amdgpu_ring_fini(struct amdgpu_ring *ring)amdgpu_wb_free (ring->adev, ring->wptr_offs); }amdgpu_bo_free_kernel (&ring->ring_obj, &ring->gpu_addr, (void **)&ring->ring);amdgpu_debugfs_ring_fini (ring); ring->adev->rings[ring->idx] =NULL ; }static void amdgpu_ring_lru_touch_locked (struct amdgpu_device *adev,struct amdgpu_ring *ring) {/* list_move_tail handles the case where ring isn't part of the list */ list_move_tail (&ring->lru_list, &adev->ring_lru_list); } +static bool amdgpu_ring_is_blacklisted (struct amdgpu_ring *ring, +int *blacklist,int num_blacklist) +{ +int i; + +for (i =0 ; i < num_blacklist; i++) { +if (ring->idx == blacklist[i]) +return true; + } + +return false; +} +/** * amdgpu_ring_lru_get - get the least recently used ring for a HW IP block * * @adev: amdgpu_device pointer * @type: amdgpu_ring_type enum +* @blacklist: blacklisted ring ids array +* @num_blacklist: number of entries in @blacklist * @ring: output ring * * Retrieve the amdgpu_ring structure for the least recently used ring of * a specific IP block (all asics). * Returns 0 on success, error on failure. */ -int amdgpu_ring_lru_get (struct amdgpu_device *adev,int type, -struct amdgpu_ring **ring) +int amdgpu_ring_lru_get (struct amdgpu_device *adev,int type,int *blacklist, +int num_blacklist,struct amdgpu_ring **ring) {struct amdgpu_ring *entry;/* List is sorted in LRU order, find first entry corresponding * to the desired HW IP */ *ring =NULL ;spin_lock (&adev->ring_lru_list_lock);list_for_each_entry (entry, &adev->ring_lru_list, lru_list) { -if (entry->funcs->type == type) { - *ring = entry; -amdgpu_ring_lru_touch_locked (adev, *ring); -break ; - } +if (entry->funcs->type != type) +continue ; + +if (amdgpu_ring_is_blacklisted (entry, blacklist, num_blacklist)) +continue ; + + *ring = entry; +amdgpu_ring_lru_touch_locked (adev, *ring); +break ; }spin_unlock (&adev->ring_lru_list_lock);if (!*ring) {DRM_ERROR ("Ring LRU contains no entries for ring type:%d\n" , type);return -EINVAL ; }return 0 ; }/** * amdgpu_ring_lru_touch - mark a ring as recently being used * * @adev: amdgpu_device pointer * @ring: ring to touch * * Move @ring to the tail of the lru list */ void amdgpu_ring_lru_touch (struct amdgpu_device *adev,struct amdgpu_ring *ring)
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h +2 -2
@@ -180,32 +180,32 @@ struct amdgpu_ring {unsigned cond_exe_offs;u64 cond_exe_gpu_addr;volatile u32 *cond_exe_cpu_addr;unsigned vm_inv_eng;#if defined(CONFIG_DEBUG_FS )struct dentry *ent;#endif };int amdgpu_ring_is_valid_index (struct amdgpu_device *adev,int hw_ip,int ring);int amdgpu_ring_alloc (struct amdgpu_ring *ring,unsigned ndw);void amdgpu_ring_insert_nop (struct amdgpu_ring *ring,uint32_t count);void amdgpu_ring_generic_pad_ib (struct amdgpu_ring *ring,struct amdgpu_ib *ib);void amdgpu_ring_commit (struct amdgpu_ring *ring);void amdgpu_ring_undo (struct amdgpu_ring *ring);int amdgpu_ring_init (struct amdgpu_device *adev,struct amdgpu_ring *ring,unsigned ring_size,struct amdgpu_irq_src *irq_src,unsigned irq_type);void amdgpu_ring_fini (struct amdgpu_ring *ring); -int amdgpu_ring_lru_get (struct amdgpu_device *adev,int hw_ip, -struct amdgpu_ring **ring); +int amdgpu_ring_lru_get (struct amdgpu_device *adev,int type,int *blacklist, +int num_blacklist,struct amdgpu_ring **ring);void amdgpu_ring_lru_touch (struct amdgpu_device *adev,struct amdgpu_ring *ring);static inline void amdgpu_ring_clear_ring (struct amdgpu_ring *ring) {int i =0 ;while (i <= ring->buf_mask) ring->ring[i++] = ring->funcs->nop; }#endif
Signature · 6 lines
2.9.3 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 6/6 drm/amdgpu: use LRU mapping policy for SDMA engines
In reply to a message not in the archiveSpreading the load across multiple SDMA engines can increase memory transfer performance.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_queue_mgr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_queue_mgr.c +1 -1
@@ -241,38 +241,38 @@ int amdgpu_queue_mgr_map(struct amdgpu_device *adev,return -EINVAL ; }if (ring >= ip_num_rings) {DRM_ERROR ("Ring index:%d exceeds maximum:%d for ip:%d\n" , ring, ip_num_rings, hw_ip);return -EINVAL ; }mutex_lock (&mapper->lock); *out_ring =amdgpu_get_cached_map (mapper, ring);if (*out_ring) {/* cache hit */ r =0 ; goto out_unlock; }switch (mapper->hw_ip) {case AMDGPU_HW_IP_GFX : -case AMDGPU_HW_IP_DMA :case AMDGPU_HW_IP_UVD :case AMDGPU_HW_IP_VCE : r =amdgpu_identity_map (adev, mapper, ring, out_ring);break ; +case AMDGPU_HW_IP_DMA :case AMDGPU_HW_IP_COMPUTE : r =amdgpu_lru_map (adev, mapper, ring, out_ring);break ;default : *out_ring =NULL ; r = -EINVAL ;DRM_ERROR ("unknown HW IP type: %d\n" , mapper->hw_ip); } out_unlock:mutex_unlock (&mapper->lock);return r; }
Signature · 6 lines
2.9.3 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
I wanted to push that to our internal branch, but found that it doesn't apply cleanly. So please rebase on alex amd-staging-4.9 branch.
Additional to that you forgot my rb on patch #4.
Regards,
Christian.
Am 22.04.2017 um 01:48 schrieb Andres Rodriguez:
Quoted 12 lines
V2 updates:
* Rebased
* All patches now have r-bSecond part of the split of the series:
Add support for high priority scheduling in amdgpu v8These patches should be close to being good enough to land.
The first two patches are simple fixes I've ported from the ROCm branch. These still need review.
Quoted 7 lines
I've fixed all of Christian's comments for patch 04:
drm/amdgpu: implement lruamdgpu_queue_mgrpolicy for compute v4_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): f7bf1964-c548-2cf5-3a46-b53cc7c80816-ANTagKRnAhcb1SvskN2V4Q@public.gmane.org
Quoted 2 lines · Christian König
I wanted to push that to our internal branch, but found that it doesn't apply cleanly. So please rebase on alex amd-staging-4.9 branch.
Please stick with my drm-next-wip tree. It will make it easier for me to integrate.
Alex
Quoted 32 lines
Additional to that you forgot my rb on patch #4.
Regards,
Christian.Am 22.04.2017 um 01:48 schrieb Andres Rodriguez:
Quoted 14 lines
V2 updates:
* Rebased
* All patches now have r-bSecond part of the split of the series:
Add support for high priority scheduling in amdgpu v8These patches should be close to being good enough to land.
The first two patches are simple fixes I've ported from the ROCm branch. These
still need review.Quoted 7 lines
I've fixed all of Christian's comments for patch 04:
drm/amdgpu: implement lruamdgpu_queue_mgrpolicy for compute v4_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): CADnq5_Pu0zNiVtf5dUAhYRyg2kuDsY8TNUQ5J14AAu7MRXXfuw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org
Quoted 11 lines · Alex Deucher
Quoted 2 lines · Christian König
I wanted to push that to our internal branch, but found that it doesn't apply cleanly. So please rebase on alex amd-staging-4.9 branch.
Please stick with my drm-next-wip tree. It will make it easier for me to integrate.
Alex
I'm guessing the tradeoff here would be a delay getting into drm-next. I'm okay with that as long as the patch series makes it in time for the 4.13 feature merge window.
One exception, I would like to get the IOCTL interface patch submitted into a branch that will land on drm-next sooner rather than later so that I can begin submitting the corresponding patches to the userspace components. Should this be amd-staging-4.9? Or should it be somewhere else?
Regards,
Andres
Quoted 32 lines
Quoted 32 lines
Additional to that you forgot my rb on patch #4.
Regards,
Christian.Am 22.04.2017 um 01:48 schrieb Andres Rodriguez:
Quoted 21 lines
V2 updates:
* Rebased
* All patches now have r-bSecond part of the split of the series:
Add support for high priority scheduling in amdgpu v8These patches should be close to being good enough to land.
The first two patches are simple fixes I've ported from the ROCm branch. These
still need review.I've fixed all of Christian's comments for patch 04:
drm/amdgpu: implement lruamdgpu_queue_mgrpolicy for compute v4_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Quoted 4 lines
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): d555fef1-afb7-6fc3-1b7f-30f7ed6f25fa-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org
Quoted 18 lines · Andres Rodriguez
Quoted 4 lines · Alex Deucher
Quoted 1 line · Christian König
Quoted 10 lines
Quoted 2 lines
I wanted to push that to our internal branch, but found that it doesn't apply cleanly. So please rebase on alex amd-staging-4.9 branch.
Please stick with my drm-next-wip tree. It will make it easier for me to integrate.
Alex
Quoted 8 lines
I'm guessing the tradeoff here would be a delay getting into drm-next. I'm okay with that as long as the patch series makes it in time for the 4.13 feature merge window.
One exception, I would like to get the IOCTL interface patch submitted into a branch that will land on drm-next sooner rather than later so that I can begin submitting the corresponding patches to the userspace components. Should this be amd-staging-4.9? Or should it be somewhere else?
No real trade-offs per se. The code either needs to get backported to our stable branch or forward ported to drm-next. It ultimately needs to land in both to be properly tested, etc.
Alex
Quoted 43 lines
Regards,
AndresQuoted 38 lines
Quoted 38 lines
Additional to that you forgot my rb on patch #4.
Regards,
Christian.Am 22.04.2017 um 01:48 schrieb Andres Rodriguez:
Quoted 15 lines
V2 updates:
* Rebased
* All patches now have r-bSecond part of the split of the series:
Add support for high priority scheduling in amdgpu v8These patches should be close to being good enough to land.
The first two patches are simple fixes I've ported from the ROCm branch. These
still need review.Quoted 7 lines
I've fixed all of Christian's comments for patch 04:
drm/amdgpu: implement lruamdgpu_queue_mgrpolicy for compute v4_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx