do not store GPU address in TTM
Subsystems (7)
v6 cover do not store GPU address in TTM
With this patch series I am trying to remove GPU address dependency in TTM and moving GPU address calculation to individual drm drivers. This cleanup will simplify introduction of drm_mem_region/domain work started by Brian Welty[1].
It would be nice if someone test this for nouveau. Rest of the drivers are already tested.
v2:
* set bo->offset = 0 for drm/nouveau if bo->mem.mm_node == NULL
v3:
* catch return value of drm_gem_vram_offset() in drm/bochs
* introduce drm_gem_vram_pg_offset() in vram helper
* improve nbo->offset calculation for nouveau
v4:
* minor coding style fixes in amdgpu and radeon
* remove unnecessary kerneldoc for internal function
v5:
* rebase on top of drm-misc-next
* fix return value of drm_gem_vram_pg_offset()
* add a comment in drm_gem_vram_pg_offset() to clearify why we return 0.
v6:
* rebase to drm-misc-next
* removed acked for vmwgfx as there was a small conflict
Nirmoy Das (8):
drm/amdgpu: move ttm bo->offset to amdgpu_bo drm/radeon: don't use ttm bo->offset drm/vmwgfx: don't use ttm bo->offset drm/nouveau: don't use ttm bo->offset v3 drm/qxl: don't use ttm bo->offset drm/vram-helper: don't use ttm bo->offset v4 drm/bochs: use drm_gem_vram_offset to get bo offset v2 drm/ttm: do not keep GPU dependent addresses
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 23 ++++++++++++++-- drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 30 ++++++++++++++++----- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c | 4 +-- drivers/gpu/drm/bochs/bochs_kms.c | 7 ++++- drivers/gpu/drm/drm_gem_vram_helper.c | 11 +++++++- drivers/gpu/drm/nouveau/dispnv04/crtc.c | 6 ++--- drivers/gpu/drm/nouveau/dispnv04/disp.c | 3 ++- drivers/gpu/drm/nouveau/dispnv04/overlay.c | 6 ++--- drivers/gpu/drm/nouveau/dispnv50/base507c.c | 2 +- drivers/gpu/drm/nouveau/dispnv50/core507d.c | 2 +- drivers/gpu/drm/nouveau/dispnv50/ovly507e.c | 2 +- drivers/gpu/drm/nouveau/dispnv50/wndw.c | 2 +- drivers/gpu/drm/nouveau/dispnv50/wndwc37e.c | 2 +- drivers/gpu/drm/nouveau/nouveau_abi16.c | 8 +++--- drivers/gpu/drm/nouveau/nouveau_bo.c | 8 ++++++ drivers/gpu/drm/nouveau/nouveau_bo.h | 3 +++ drivers/gpu/drm/nouveau/nouveau_chan.c | 2 +- drivers/gpu/drm/nouveau/nouveau_dmem.c | 2 +- drivers/gpu/drm/nouveau/nouveau_fbcon.c | 2 +- drivers/gpu/drm/nouveau/nouveau_gem.c | 10 +++---- drivers/gpu/drm/qxl/qxl_drv.h | 6 ++--- drivers/gpu/drm/qxl/qxl_kms.c | 5 ++-- drivers/gpu/drm/qxl/qxl_object.h | 5 ---- drivers/gpu/drm/qxl/qxl_ttm.c | 9 ------- drivers/gpu/drm/radeon/radeon.h | 1 + drivers/gpu/drm/radeon/radeon_object.h | 16 ++++++++++- drivers/gpu/drm/radeon/radeon_ttm.c | 4 +-- drivers/gpu/drm/ttm/ttm_bo.c | 7 ----- drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 4 +-- drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 2 -- include/drm/ttm/ttm_bo_api.h | 2 -- include/drm/ttm/ttm_bo_driver.h | 1 - 36 files changed, 125 insertions(+), 78 deletions(-)
--
2.27.0
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v6 1/8 drm/amdgpu: move ttm bo->offset to amdgpu_bo
GPU address should belong to driver not in memory management. This patch moves ttm bo.offset and gpu_offset calculation to amdgpu driver.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 23 ++++++++++++++-- drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 30 ++++++++++++++++----- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c | 4 +-- 5 files changed, 48 insertions(+), 11 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +21 -2
@@ -918,7 +918,8 @@ int amdgpu_bo_pin_restricted(struct amdgpu_bo *bo, u32 domain, bo->pin_count++;if (max_offset !=0 ) { -u64 domain_start = bo->tbo.bdev->man[mem_type].gpu_offset; +u64 domain_start =amdgpu_ttm_domain_start (adev, + mem_type);WARN_ON_ONCE (max_offset < (amdgpu_bo_gpu_offset (bo) - domain_start)); }
@@ -1484,7 +1485,25 @@ u64 amdgpu_bo_gpu_offset(struct amdgpu_bo *bo)WARN_ON_ONCE (bo->tbo.mem.mem_type ==TTM_PL_VRAM && !(bo->flags &AMDGPU_GEM_CREATE_VRAM_CONTIGUOUS )); -return amdgpu_gmc_sign_extend (bo->tbo.offset); +return amdgpu_bo_gpu_offset_no_check (bo); +} + +/** +* amdgpu_bo_gpu_offset_no_check - return GPU offset of bo +* @bo: amdgpu object for which we query the offset +* +* Returns: +* current GPU offset of the object without raising warnings. +*/ +u64 amdgpu_bo_gpu_offset_no_check (struct amdgpu_bo *bo) +{ +struct amdgpu_device *adev =amdgpu_ttm_adev (bo->tbo.bdev); +uint64_t offset; + + offset = (bo->tbo.mem.start <<PAGE_SHIFT ) + +amdgpu_ttm_domain_start (adev, bo->tbo.mem.mem_type); + +return amdgpu_gmc_sign_extend (offset); }/**
drivers/gpu/drm/amd/amdgpu/amdgpu_object.h +1 -0
@@ -282,6 +282,7 @@ int amdgpu_bo_sync_wait_resv(struct amdgpu_device *adev, struct dma_resv *resv, bool intr);int amdgpu_bo_sync_wait (struct amdgpu_bo *bo,void *owner,bool intr);u64 amdgpu_bo_gpu_offset (struct amdgpu_bo *bo); +u64 amdgpu_bo_gpu_offset_no_check (struct amdgpu_bo *bo);int amdgpu_bo_validate (struct amdgpu_bo *bo);int amdgpu_bo_restore_shadow (struct amdgpu_bo *shadow,struct dma_fence **fence);
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +23 -7
@@ -96,7 +96,6 @@ static int amdgpu_init_mem_type(struct ttm_bo_device *bdev, uint32_t type,case TTM_PL_TT :/* GTT memory */ man->func = &amdgpu_gtt_mgr_func; - man->gpu_offset = adev->gmc.gart_start; man->available_caching =TTM_PL_MASK_CACHING ; man->default_caching =TTM_PL_FLAG_CACHED ; man->flags =TTM_MEMTYPE_FLAG_MAPPABLE |TTM_MEMTYPE_FLAG_CMA ;
@@ -104,7 +103,6 @@ static int amdgpu_init_mem_type(struct ttm_bo_device *bdev, uint32_t type,case TTM_PL_VRAM :/* "On-card" video ram */ man->func = &amdgpu_vram_mgr_func; - man->gpu_offset = adev->gmc.vram_start; man->flags =TTM_MEMTYPE_FLAG_FIXED |TTM_MEMTYPE_FLAG_MAPPABLE ; man->available_caching =TTM_PL_FLAG_UNCACHED |TTM_PL_FLAG_WC ;
@@ -115,7 +113,6 @@ static int amdgpu_init_mem_type(struct ttm_bo_device *bdev, uint32_t type,case AMDGPU_PL_OA :/* On-chip GDS memory*/ man->func = &ttm_bo_manager_func; - man->gpu_offset =0 ; man->flags =TTM_MEMTYPE_FLAG_FIXED |TTM_MEMTYPE_FLAG_CMA ; man->available_caching =TTM_PL_FLAG_UNCACHED ; man->default_caching =TTM_PL_FLAG_UNCACHED ;
@@ -263,7 +260,8 @@ static uint64_t amdgpu_mm_node_addr(struct ttm_buffer_object *bo,if (mm_node->start !=AMDGPU_BO_INVALID_OFFSET ) { addr = mm_node->start <<PAGE_SHIFT ; - addr += bo->bdev->man[mem->mem_type].gpu_offset; + addr +=amdgpu_ttm_domain_start (amdgpu_ttm_adev (bo->bdev), + mem->mem_type); }return addr; }
@@ -750,6 +748,27 @@ static unsigned long amdgpu_ttm_io_mem_pfn(struct ttm_buffer_object *bo, (offset >>PAGE_SHIFT ); } +/** +* amdgpu_ttm_domain_start - Returns GPU start address +* @adev: amdgpu device object +* @type: type of the memory +* +* Returns: +* GPU start address of a memory domain +*/ + +uint64_t amdgpu_ttm_domain_start (struct amdgpu_device *adev,uint32_t type) +{ +switch (type) { +case TTM_PL_TT : +return adev->gmc.gart_start; +case TTM_PL_VRAM : +return adev->gmc.vram_start; + } + +return 0 ; +} +/* * TTM backend functions. */
@@ -1163,9 +1182,6 @@ int amdgpu_ttm_alloc_gart(struct ttm_buffer_object *bo) bo->mem = tmp; } - bo->offset = (bo->mem.start <<PAGE_SHIFT ) + - bo->bdev->man[bo->mem.mem_type].gpu_offset; -return 0 ; }
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h +1 -0
@@ -112,6 +112,7 @@ int amdgpu_fill_buffer(struct amdgpu_bo *bo,int amdgpu_mmap (struct file *filp,struct vm_area_struct *vma);int amdgpu_ttm_alloc_gart (struct ttm_buffer_object *bo);int amdgpu_ttm_recover_gart (struct ttm_buffer_object *tbo); +uint64_t amdgpu_ttm_domain_start (struct amdgpu_device *adev,uint32_t type);#if IS_ENABLED (CONFIG_DRM_AMDGPU_USERPTR )int amdgpu_ttm_tt_get_user_pages (struct amdgpu_bo *bo,struct page **pages);
drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c +2 -2
@@ -141,7 +141,7 @@ static void amdgpu_vm_sdma_copy_ptes(struct amdgpu_vm_update_params *p, src += p->num_dw_left *4 ; - pe +=amdgpu_gmc_sign_extend (bo->tbo.offset); + pe +=amdgpu_bo_gpu_offset_no_check (bo);trace_amdgpu_vm_copy_ptes (pe, src, count, p->direct);amdgpu_vm_copy_pte (p->adev, ib, pe, src, count);
@@ -168,7 +168,7 @@ static void amdgpu_vm_sdma_set_ptes(struct amdgpu_vm_update_params *p, {struct amdgpu_ib *ib = p->job->ibs; - pe +=amdgpu_gmc_sign_extend (bo->tbo.offset); + pe +=amdgpu_bo_gpu_offset_no_check (bo);trace_amdgpu_vm_set_ptes (pe, addr, count, incr, flags, p->direct);if (count <3 ) { amdgpu_vm_write_pte(p->adev, ib, pe, addr | flags,
Signature · 6 lines
2.27.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v6 2/8 drm/radeon: don't use ttm bo->offset
In reply to Nirmoy DasCalculate GPU offset in radeon_bo_gpu_offset without depending on bo->offset.
--- drivers/gpu/drm/radeon/radeon.h | 1 + drivers/gpu/drm/radeon/radeon_object.h | 16 +++++++++++++++- drivers/gpu/drm/radeon/radeon_ttm.c | 4 +--- 3 files changed, 17 insertions(+), 4 deletions(-)
drivers/gpu/drm/radeon/radeon.h +1 -0
@@ -2828,6 +2828,7 @@ extern void radeon_ttm_set_active_vram_size(struct radeon_device *rdev, u64 sizeextern void radeon_program_register_sequence (struct radeon_device *rdev,const u32 *registers,const u32 array_size); +struct radeon_device *radeon_get_rdev (struct ttm_bo_device *bdev);/* * vm
drivers/gpu/drm/radeon/radeon_object.h +15 -1
@@ -90,7 +90,21 @@ static inline void radeon_bo_unreserve(struct radeon_bo *bo)*/ static inline u64 radeon_bo_gpu_offset (struct radeon_bo *bo) { -return bo->tbo.offset; +struct radeon_device *rdev; +u64 start =0 ; + + rdev =radeon_get_rdev (bo->tbo.bdev); + +switch (bo->tbo.mem.mem_type) { +case TTM_PL_TT : + start = rdev->mc.gtt_start; +break ; +case TTM_PL_VRAM : + start = rdev->mc.vram_start; +break ; + } + +return (bo->tbo.mem.start <<PAGE_SHIFT ) + start; }static inline unsigned long radeon_bo_size (struct radeon_bo *bo)
drivers/gpu/drm/radeon/radeon_ttm.c +1 -3
@@ -56,7 +56,7 @@static int radeon_ttm_debugfs_init (struct radeon_device *rdev);static void radeon_ttm_debugfs_fini (struct radeon_device *rdev); -static struct radeon_device *radeon_get_rdev (struct ttm_bo_device *bdev) +struct radeon_device *radeon_get_rdev (struct ttm_bo_device *bdev) {struct radeon_mman *mman;struct radeon_device *rdev;
@@ -82,7 +82,6 @@ static int radeon_init_mem_type(struct ttm_bo_device *bdev, uint32_t type,break ;case TTM_PL_TT : man->func = &ttm_bo_manager_func; - man->gpu_offset = rdev->mc.gtt_start; man->available_caching =TTM_PL_MASK_CACHING ; man->default_caching =TTM_PL_FLAG_CACHED ; man->flags =TTM_MEMTYPE_FLAG_MAPPABLE |TTM_MEMTYPE_FLAG_CMA ;
@@ -104,7 +103,6 @@ static int radeon_init_mem_type(struct ttm_bo_device *bdev, uint32_t type,case TTM_PL_VRAM :/* "On-card" video ram */ man->func = &ttm_bo_manager_func; - man->gpu_offset = rdev->mc.vram_start; man->flags =TTM_MEMTYPE_FLAG_FIXED |TTM_MEMTYPE_FLAG_MAPPABLE ; man->available_caching =TTM_PL_FLAG_UNCACHED |TTM_PL_FLAG_WC ;
Signature · 6 lines
2.27.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v6 3/8 drm/vmwgfx: don't use ttm bo->offset
In reply to Nirmoy DasCalculate GPU offset within vmwgfx driver itself without depending on bo->offset.
--- drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 4 ++-- drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 2 -- 4 files changed, 4 insertions(+), 6 deletions(-)
drivers/gpu/drm/vmwgfx/vmwgfx_bo.c +2 -2
@@ -258,7 +258,7 @@ int vmw_bo_pin_in_start_of_vram(struct vmw_private *dev_priv, ret =ttm_bo_validate (bo, &placement, &ctx);/* For some reason we didn't end up at the start of vram */ -WARN_ON (ret ==0 && bo->offset !=0 ); +WARN_ON (ret ==0 && bo->mem.start !=0 );if (!ret)vmw_bo_pin_reserved (buf, true);
@@ -317,7 +317,7 @@ void vmw_bo_get_guest_ptr(const struct ttm_buffer_object *bo, {if (bo->mem.mem_type ==TTM_PL_VRAM ) { ptr->gmrId =SVGA_GMR_FRAMEBUFFER ; - ptr->offset = bo->offset; + ptr->offset = bo->mem.start <<PAGE_SHIFT ; }else { ptr->gmrId = bo->mem.start; ptr->offset =0 ;
drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c +1 -1
@@ -3696,7 +3696,7 @@ static void vmw_apply_relocations(struct vmw_sw_context *sw_context) bo = &reloc->vbo->base;switch (bo->mem.mem_type) {case TTM_PL_VRAM : - reloc->location->offset += bo->offset; + reloc->location->offset += bo->mem.start <<PAGE_SHIFT ; reloc->location->gmrId =SVGA_GMR_FRAMEBUFFER ;break ;case VMW_PL_GMR :
drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c +1 -1
@@ -610,7 +610,7 @@ static int vmw_fifo_emit_dummy_legacy_query(struct vmw_private *dev_priv,if (bo->mem.mem_type ==TTM_PL_VRAM ) { cmd->body.guestResult.gmrId =SVGA_GMR_FRAMEBUFFER ; - cmd->body.guestResult.offset = bo->offset; + cmd->body.guestResult.offset = bo->mem.start <<PAGE_SHIFT ; }else { cmd->body.guestResult.gmrId = bo->mem.start; cmd->body.guestResult.offset =0 ;
drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c +0 -2
@@ -750,7 +750,6 @@ static int vmw_init_mem_type(struct ttm_bo_device *bdev, uint32_t type,case TTM_PL_VRAM :/* "On-card" video ram */ man->func = &vmw_thp_func; - man->gpu_offset =0 ; man->flags =TTM_MEMTYPE_FLAG_FIXED |TTM_MEMTYPE_FLAG_MAPPABLE ; man->available_caching =TTM_PL_FLAG_CACHED ; man->default_caching =TTM_PL_FLAG_CACHED ;
@@ -763,7 +762,6 @@ static int vmw_init_mem_type(struct ttm_bo_device *bdev, uint32_t type,* slots as well as the bo size. */ man->func = &vmw_gmrid_manager_func; - man->gpu_offset =0 ; man->flags =TTM_MEMTYPE_FLAG_CMA |TTM_MEMTYPE_FLAG_MAPPABLE ; man->available_caching =TTM_PL_FLAG_CACHED ; man->default_caching =TTM_PL_FLAG_CACHED ;
--
2.27.0
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v6 4/8 drm/nouveau: don't use ttm bo->offset v3
In reply to Nirmoy DasStore ttm bo->offset in struct nouveau_bo instead.
--- drivers/gpu/drm/nouveau/dispnv04/crtc.c | 6 +++--- drivers/gpu/drm/nouveau/dispnv04/disp.c | 3 ++- drivers/gpu/drm/nouveau/dispnv04/overlay.c | 6 +++--- drivers/gpu/drm/nouveau/dispnv50/base507c.c | 2 +- drivers/gpu/drm/nouveau/dispnv50/core507d.c | 2 +- drivers/gpu/drm/nouveau/dispnv50/ovly507e.c | 2 +- drivers/gpu/drm/nouveau/dispnv50/wndw.c | 2 +- drivers/gpu/drm/nouveau/dispnv50/wndwc37e.c | 2 +- drivers/gpu/drm/nouveau/nouveau_abi16.c | 8 ++++---- drivers/gpu/drm/nouveau/nouveau_bo.c | 8 ++++++++ drivers/gpu/drm/nouveau/nouveau_bo.h | 3 +++ drivers/gpu/drm/nouveau/nouveau_chan.c | 2 +- drivers/gpu/drm/nouveau/nouveau_dmem.c | 2 +- drivers/gpu/drm/nouveau/nouveau_fbcon.c | 2 +- drivers/gpu/drm/nouveau/nouveau_gem.c | 10 +++++----- 15 files changed, 36 insertions(+), 24 deletions(-)
drivers/gpu/drm/nouveau/dispnv04/crtc.c +3 -3
@@ -845,7 +845,7 @@ nv04_crtc_do_mode_set_base(struct drm_crtc *crtc, fb =nouveau_framebuffer (crtc->primary->fb); } - nv_crtc->fb.offset = fb->nvbo->bo.offset; + nv_crtc->fb.offset = fb->nvbo->offset;if (nv_crtc->lut.depth != drm_fb->format->depth) { nv_crtc->lut.depth = drm_fb->format->depth;
@@ -1013,7 +1013,7 @@ nv04_crtc_cursor_set(struct drm_crtc *crtc, struct drm_file *file_priv,nv04_cursor_upload (dev, cursor, nv_crtc->cursor.nvbo);nouveau_bo_unmap (cursor); - nv_crtc->cursor.offset = nv_crtc->cursor.nvbo->bo.offset; + nv_crtc->cursor.offset = nv_crtc->cursor.nvbo->offset; nv_crtc->cursor.set_offset (nv_crtc, nv_crtc->cursor.offset); nv_crtc->cursor.show (nv_crtc, true); out:
@@ -1191,7 +1191,7 @@ nv04_crtc_page_flip(struct drm_crtc *crtc, struct drm_framebuffer *fb,/* Initialize a page flip struct */ *s = (struct nv04_page_flip_state ) { { }, event, crtc, fb->format->cpp[0 ] *8 , fb->pitches[0 ], - new_bo->bo.offset }; + new_bo->offset };/* Keep vblanks on during flip, for the target crtc of this flip */ drm_crtc_vblank_get (crtc);
drivers/gpu/drm/nouveau/dispnv04/disp.c +2 -1
@@ -151,7 +151,8 @@ nv04_display_init(struct drm_device *dev, bool resume, bool runtime)continue ;if (nv_crtc->cursor.set_offset) - nv_crtc->cursor.set_offset (nv_crtc, nv_crtc->cursor.nvbo->bo.offset); + nv_crtc->cursor.set_offset (nv_crtc, + nv_crtc->cursor.nvbo->offset); nv_crtc->cursor.set_pos (nv_crtc, nv_crtc->cursor_saved_x, nv_crtc->cursor_saved_y); }
drivers/gpu/drm/nouveau/dispnv04/overlay.c +3 -3
@@ -150,7 +150,7 @@ nv10_update_plane(struct drm_plane *plane, struct drm_crtc *crtc,nvif_mask (dev,NV_PCRTC_ENGINE_CTRL + soff2,NV_CRTC_FSEL_OVERLAY ,0 );nvif_wr32 (dev,NV_PVIDEO_BASE (flip),0 ); -nvif_wr32 (dev,NV_PVIDEO_OFFSET_BUFF (flip), nv_fb->nvbo->bo.offset); +nvif_wr32 (dev,NV_PVIDEO_OFFSET_BUFF (flip), nv_fb->nvbo->offset);nvif_wr32 (dev,NV_PVIDEO_SIZE_IN (flip), src_h <<16 | src_w);nvif_wr32 (dev,NV_PVIDEO_POINT_IN (flip), src_y <<16 | src_x);nvif_wr32 (dev,NV_PVIDEO_DS_DX (flip), (src_w <<20 ) / crtc_w);
@@ -172,7 +172,7 @@ nv10_update_plane(struct drm_plane *plane, struct drm_crtc *crtc,if (format &NV_PVIDEO_FORMAT_PLANAR ) {nvif_wr32 (dev,NV_PVIDEO_UVPLANE_BASE (flip),0 );nvif_wr32 (dev,NV_PVIDEO_UVPLANE_OFFSET_BUFF (flip), - nv_fb->nvbo->bo.offset + fb->offsets[1 ]); + nv_fb->nvbo->offset + fb->offsets[1 ]); }nvif_wr32 (dev,NV_PVIDEO_FORMAT (flip), format | fb->pitches[0 ]);nvif_wr32 (dev,NV_PVIDEO_STOP ,0 );
@@ -396,7 +396,7 @@ nv04_update_plane(struct drm_plane *plane, struct drm_crtc *crtc,for (i =0 ; i <2 ; i++) {nvif_wr32 (dev,NV_PVIDEO_BUFF0_START_ADDRESS +4 * i, - nv_fb->nvbo->bo.offset); + nv_fb->nvbo->offset);nvif_wr32 (dev,NV_PVIDEO_BUFF0_PITCH_LENGTH +4 * i, fb->pitches[0 ]);nvif_wr32 (dev,NV_PVIDEO_BUFF0_OFFSET +4 * i,0 );
drivers/gpu/drm/nouveau/dispnv50/base507c.c +1 -1
@@ -275,7 +275,7 @@ base507c_new_(const struct nv50_wndw_func *func, const u32 *format, ret =nv50_dmac_create (&drm->client.device, &disp->disp->object, &oclass, head, &args,sizeof (args), - disp->sync->bo.offset, &wndw->wndw); + disp->sync->offset, &wndw->wndw);if (ret) {NV_ERROR (drm,"base%04x allocation failed: %d\n" , oclass, ret);return ret;
drivers/gpu/drm/nouveau/dispnv50/core507d.c +1 -1
@@ -100,7 +100,7 @@ core507d_new_(const struct nv50_core_func *func, struct nouveau_drm *drm, ret =nv50_dmac_create (&drm->client.device, &disp->disp->object, &oclass,0 , &args,sizeof (args), - disp->sync->bo.offset, &core->chan); + disp->sync->offset, &core->chan);if (ret) {NV_ERROR (drm,"core%04x allocation failed: %d\n" , oclass, ret);return ret;
drivers/gpu/drm/nouveau/dispnv50/ovly507e.c +1 -1
@@ -186,7 +186,7 @@ ovly507e_new_(const struct nv50_wndw_func *func, const u32 *format, ret =nv50_dmac_create (&drm->client.device, &disp->disp->object, &oclass,0 , &args,sizeof (args), - disp->sync->bo.offset, &wndw->wndw); + disp->sync->offset, &wndw->wndw);if (ret) {NV_ERROR (drm,"ovly%04x allocation failed: %d\n" , oclass, ret);return ret;
drivers/gpu/drm/nouveau/dispnv50/wndw.c +1 -1
@@ -511,7 +511,7 @@ nv50_wndw_prepare_fb(struct drm_plane *plane, struct drm_plane_state *state) } asyw->state.fence =dma_resv_get_excl_rcu (fb->nvbo->bo.base.resv); - asyw->image.offset[0 ] = fb->nvbo->bo.offset; + asyw->image.offset[0 ] = fb->nvbo->offset;if (wndw->func->prepare) { asyh =nv50_head_atom_get (asyw->state.state, asyw->state.crtc);
drivers/gpu/drm/nouveau/dispnv50/wndwc37e.c +1 -1
@@ -298,7 +298,7 @@ wndwc37e_new_(const struct nv50_wndw_func *func, struct nouveau_drm *drm, ret =nv50_dmac_create (&drm->client.device, &disp->disp->object, &oclass,0 , &args,sizeof (args), - disp->sync->bo.offset, &wndw->wndw); + disp->sync->offset, &wndw->wndw);if (ret) {NV_ERROR (drm,"qndw%04x allocation failed: %d\n" , oclass, ret);return ret;
drivers/gpu/drm/nouveau/nouveau_abi16.c +4 -4
@@ -558,13 +558,13 @@ nouveau_abi16_ioctl_notifierobj_alloc(ABI16_IOCTL_ARGS)if (drm->agp.bridge) { args.target =NV_DMA_V0_TARGET_AGP ; args.access =NV_DMA_V0_ACCESS_RDWR ; - args.start += drm->agp.base + chan->ntfy->bo.offset; - args.limit += drm->agp.base + chan->ntfy->bo.offset; + args.start += drm->agp.base + chan->ntfy->offset; + args.limit += drm->agp.base + chan->ntfy->offset; }else { args.target =NV_DMA_V0_TARGET_VM ; args.access =NV_DMA_V0_ACCESS_RDWR ; - args.start += chan->ntfy->bo.offset; - args.limit += chan->ntfy->bo.offset; + args.start += chan->ntfy->offset; + args.limit += chan->ntfy->offset; } client->route =NVDRM_OBJECT_ABI16 ;
drivers/gpu/drm/nouveau/nouveau_bo.c +8 -0
@@ -1317,6 +1317,14 @@ nouveau_bo_move_ntfy(struct ttm_buffer_object *bo, bool evict,nouveau_vma_unmap (vma); } } + +if (new_reg) { +if (new_reg->mm_node) + nvbo->offset = (new_reg->start <<PAGE_SHIFT ); +else + nvbo->offset =0 ; + } + } static int
drivers/gpu/drm/nouveau/nouveau_bo.h +3 -0
@@ -24,6 +24,9 @@ struct nouveau_bo {int pbbo_index;bool validate_mapped; +/* GPU address space is independent of CPU word size */ +uint64_t offset; +struct list_head vma_list; unsigned contig:1;
drivers/gpu/drm/nouveau/nouveau_chan.c +1 -1
@@ -162,7 +162,7 @@ nouveau_channel_prep(struct nouveau_drm *drm, struct nvif_device *device,* pushbuf lives in, this is because the GEM code requires that * we be able to call out to other (indirect) push buffers */ - chan->push.addr = chan->push.buffer->bo.offset; + chan->push.addr = chan->push.buffer->offset;if (device->info.family >=NV_DEVICE_INFO_V0_TESLA ) { ret = nouveau_vma_new(chan->push.buffer, chan->vmm,
drivers/gpu/drm/nouveau/nouveau_dmem.c +1 -1
@@ -90,7 +90,7 @@ static unsigned long nouveau_dmem_page_addr(struct page *page)struct nouveau_dmem_chunk *chunk = page->zone_device_data;unsigned long idx =page_to_pfn (page) - chunk->pfn_first; -return (idx <<PAGE_SHIFT ) + chunk->bo->bo.offset; +return (idx <<PAGE_SHIFT ) + chunk->bo->offset; }static void nouveau_dmem_page_free (struct page *page)
drivers/gpu/drm/nouveau/nouveau_fbcon.c +1 -1
@@ -393,7 +393,7 @@ nouveau_fbcon_create(struct drm_fb_helper *helper,/* To allow resizeing without swapping buffers */ NV_INFO (drm,"allocated %dx%d fb: 0x%llx, bo %p\n" , - fb->base.width, fb->base.height, fb->nvbo->bo.offset, nvbo); + fb->base.width, fb->base.height, fb->nvbo->offset, nvbo);vga_switcheroo_client_fb_set (dev->pdev, info);return 0 ;
drivers/gpu/drm/nouveau/nouveau_gem.c +5 -5
@@ -232,7 +232,7 @@ nouveau_gem_info(struct drm_file *file_priv, struct drm_gem_object *gem, rep->domain =NOUVEAU_GEM_DOMAIN_GART ; else rep->domain = NOUVEAU_GEM_DOMAIN_VRAM; - rep->offset = nvbo->bo.offset; + rep->offset = nvbo->offset;if (vmm->vmm.object.oclass >=NVIF_CLASS_VMM_NV50 ) { vma =nouveau_vma_find (nvbo, vmm);if (!vma)
@@ -516,7 +516,7 @@ validate_list(struct nouveau_channel *chan, struct nouveau_cli *cli, }if (drm->client.device.info.family <NV_DEVICE_INFO_V0_TESLA ) { - if (nvbo->bo.offset == b->presumed.offset && + if (nvbo->offset == b->presumed.offset && ((nvbo->bo.mem.mem_type == TTM_PL_VRAM && b->presumed.domain & NOUVEAU_GEM_DOMAIN_VRAM) || (nvbo->bo.mem.mem_type == TTM_PL_TT &&
@@ -527,7 +527,7 @@ validate_list(struct nouveau_channel *chan, struct nouveau_cli *cli, b->presumed.domain =NOUVEAU_GEM_DOMAIN_GART ; else b->presumed.domain = NOUVEAU_GEM_DOMAIN_VRAM; - b->presumed.offset = nvbo->bo.offset; + b->presumed.offset = nvbo->offset; b->presumed.valid =0 ; relocs++; }
@@ -805,7 +805,7 @@ nouveau_gem_ioctl_pushbuf(struct drm_device *dev, void *data,struct nouveau_bo *nvbo = (void *)(unsigned long ) bo[push[i].bo_index].user_priv; -OUT_RING (chan, (nvbo->bo.offset + push[i].offset) |2 ); +OUT_RING (chan, (nvbo->offset + push[i].offset) |2 );OUT_RING (chan,0 ); } }else {
@@ -840,7 +840,7 @@ nouveau_gem_ioctl_pushbuf(struct drm_device *dev, void *data, }OUT_RING (chan,0x20000000 | - (nvbo->bo.offset + push[i].offset)); + (nvbo->offset + push[i].offset));OUT_RING (chan,0 );for (j =0 ; j <NOUVEAU_DMA_SKIPS ; j++)OUT_RING (chan,0 );
Signature · 6 lines
2.27.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v6 5/8 drm/qxl: don't use ttm bo->offset
In reply to Nirmoy DasThis patch removes slot->gpu_offset which is not required as VRAM and PRIV slot are in separate PCI bar.
This patch also removes unused qxl_bo_gpu_offset()
--- drivers/gpu/drm/qxl/qxl_drv.h | 6 ++---- drivers/gpu/drm/qxl/qxl_kms.c | 5 ++--- drivers/gpu/drm/qxl/qxl_object.h | 5 ----- drivers/gpu/drm/qxl/qxl_ttm.c | 9 --------- 4 files changed, 4 insertions(+), 21 deletions(-)
drivers/gpu/drm/qxl/qxl_drv.h +2 -4
@@ -134,7 +134,6 @@ struct qxl_memslot {uint64_t start_phys_addr;uint64_t size;uint64_t high_bits; -uint64_t gpu_offset; };enum {
@@ -307,10 +306,9 @@ qxl_bo_physical_address(struct qxl_device *qdev, struct qxl_bo *bo, (bo->tbo.mem.mem_type ==TTM_PL_VRAM ) ? &qdev->main_slot : &qdev->surfaces_slot; -WARN_ON_ONCE ((bo->tbo.offset & slot->gpu_offset) != slot->gpu_offset); +/* TODO - need to hold one of the locks to read bo->tbo.mem.start */ -/* TODO - need to hold one of the locks to read tbo.offset */ -return slot->high_bits | (bo->tbo.offset - slot->gpu_offset + offset); +return slot->high_bits | ((bo->tbo.mem.start <<PAGE_SHIFT ) + offset); }/* qxl_display.c */
drivers/gpu/drm/qxl/qxl_kms.c +2 -3
@@ -87,11 +87,10 @@ static void setup_slot(struct qxl_device *qdev, high_bits <<= (64 - (qdev->rom->slot_gen_bits + qdev->rom->slot_id_bits)); slot->high_bits = high_bits; -DRM_INFO ("slot %d (%s): base 0x%08lx, size 0x%08lx, gpu_offset 0x%lx\n" , +DRM_INFO ("slot %d (%s): base 0x%08lx, size 0x%08lx\n" , slot->index, slot->name, (unsigned long )slot->start_phys_addr, - (unsigned long )slot->size, - (unsigned long )slot->gpu_offset); + (unsigned long )slot->size); }void qxl_reinit_memslots (struct qxl_device *qdev)
drivers/gpu/drm/qxl/qxl_object.h +0 -5
@@ -48,11 +48,6 @@ static inline void qxl_bo_unreserve(struct qxl_bo *bo)ttm_bo_unreserve (&bo->tbo); } -static inline u64 qxl_bo_gpu_offset (struct qxl_bo *bo) -{ -return bo->tbo.offset; -} -static inline unsigned long qxl_bo_size (struct qxl_bo *bo) {return bo->tbo.num_pages <<PAGE_SHIFT ;
drivers/gpu/drm/qxl/qxl_ttm.c +0 -9
@@ -51,11 +51,6 @@ static struct qxl_device *qxl_get_qdev(struct ttm_bo_device *bdev)static int qxl_init_mem_type (struct ttm_bo_device *bdev,uint32_t type,struct ttm_mem_type_manager *man) { -struct qxl_device *qdev =qxl_get_qdev (bdev); -unsigned int gpu_offset_shift = -64 - (qdev->rom->slot_gen_bits + qdev->rom->slot_id_bits +8 ); -struct qxl_memslot *slot; -switch (type) {case TTM_PL_SYSTEM :/* System memory */
@@ -66,11 +61,7 @@ static int qxl_init_mem_type(struct ttm_bo_device *bdev, uint32_t type,case TTM_PL_VRAM :case TTM_PL_PRIV :/* "On-card" video ram */ - slot = (type ==TTM_PL_VRAM ) ? - &qdev->main_slot : &qdev->surfaces_slot; - slot->gpu_offset = (uint64_t )type << gpu_offset_shift; man->func = &ttm_bo_manager_func; - man->gpu_offset = slot->gpu_offset; man->flags =TTM_MEMTYPE_FLAG_FIXED |TTM_MEMTYPE_FLAG_MAPPABLE ; man->available_caching =TTM_PL_MASK_CACHING ;
Signature · 6 lines
2.27.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v6 6/8 drm/vram-helper: don't use ttm bo->offset v4
In reply to Nirmoy DasCalculate GEM VRAM bo's offset within vram-helper without depending on bo->offset.
--- drivers/gpu/drm/drm_gem_vram_helper.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
drivers/gpu/drm/drm_gem_vram_helper.c +10 -1
@@ -281,6 +281,15 @@ u64 drm_gem_vram_mmap_offset(struct drm_gem_vram_object *gbo) }EXPORT_SYMBOL (drm_gem_vram_mmap_offset); +static u64 drm_gem_vram_pg_offset (struct drm_gem_vram_object *gbo) +{ +/* Keep TTM behavior for now, remove when drivers are audited */ +if (WARN_ON_ONCE (!gbo->bo.mem.mm_node)) +return 0 ; + +return gbo->bo.mem.start; +} +/** * drm_gem_vram_offset() - \ Returns a GEM VRAM object's offset in video memory
@@ -297,7 +306,7 @@ s64 drm_gem_vram_offset(struct drm_gem_vram_object *gbo) {if (WARN_ON_ONCE (!gbo->pin_count))return (s64)-ENODEV ; -return gbo->bo.offset; +return drm_gem_vram_pg_offset (gbo) <<PAGE_SHIFT ; }EXPORT_SYMBOL (drm_gem_vram_offset);
Signature · 6 lines
2.27.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerRe: [PATCH 6/8] drm/vram-helper: don't use ttm bo->offset v4
Hi
Am 24.06.20 um 20:26 schrieb Nirmoy Das:
Quoted 14 lines
Calculate GEM VRAM bo's offset within vram-helper without depending on
bo->offset.Signed-off-by Nirmoy Das <[email protected]>Reviewed-by Daniel Vetter <[email protected]>--- drivers/gpu/drm/drm_gem_vram_helper.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)drivers/gpu/drm/drm_gem_vram_helper.c +0
-0
drivers/gpu/drm/drm_gem_vram_helper.c u64 drm_gem_vram_mmap_offset(struct drm_gem_vram_object *gbo) · line 287
Quoted 7 lines
drivers/gpu/drm/drm_gem_vram_helper.c +4
-0@@ -281,6 +281,15 @@ u64 drm_gem_vram_mmap_offset(struct drm_gem_vram_object *gbo) }EXPORT_SYMBOL (drm_gem_vram_mmap_offset); +static u64 drm_gem_vram_pg_offset (struct drm_gem_vram_object *gbo) +{ +/* Keep TTM behavior for now, remove when drivers are audited */ +if (WARN_ON_ONCE (!gbo->bo.mem.mm_node))
At this line I got
[ 146.133821] ------------[ cut here ]------------
[ 146.133872] WARNING: CPU: 6 PID: 7 at
drivers/gpu/drm/drm_gem_vram_helper.c:284 drm_gem_vram_offset+0x59/0x60
[drm_vram_helper]
[ 146.133880] Modules linked in: fuse(E) af_packet(E) ebtable_filter(E)
ebtables(E) ip6table_filter(E) ip6_tables(E) iptable_filter(E)
ip_tables(E) x_tables(E) bpfilter(E) rfkill(E) dmi_sysfs(E) msr(E)
intel_powerclamp(E) coretemp(E) kv)
[ 146.134051] scsi_dh_emc(E) scsi_dh_alua(E)
[ 146.134074] CPU: 6 PID: 7 Comm: kworker/u48:0 Tainted: G E
5.9.0-rc4-1-default+ #492
[ 146.134083] Hardware name: Sun Microsystems SUN FIRE X2270 M2/SUN
FIRE X2270 M2, BIOS 2.05 07/01/2010
[ 146.134099] Workqueue: events_unbound commit_work
[ 146.134116] RIP: 0010:drm_gem_vram_offset+0x59/0x60 [drm_vram_helper]
[ 146.134128] Code: 02 00 00 00 74 24 48 8d bb 80 02 00 00 e8 ef 27 17
d7 48 8b 83 80 02 00 00 5b 48 c1 e0 0c c3 0f 0b 48 c7 c0 ed ff ff ff 5b
c3 <0f> 0b 31 c0 5b c3 90 66 66 66 66 90 41 56 41 55 49 89 d5 41 54 49
[ 146.134137] RSP: 0018:ffffc90000107c38 EFLAGS: 00010246
[ 146.134149] RAX: 0000000000000000 RBX: ffff888111155000 RCX:
ffffffffc032323b
[ 146.134158] RDX: dffffc0000000000 RSI: ffff88810e236300 RDI:
ffff888111155278
[ 146.134168] RBP: ffff888109090000 R08: ffffffffc0323225 R09:
0000000000000002
[ 146.134177] R10: ffffed1020675020 R11: 0000000000000001 R12:
ffff888109091050
[ 146.134187] R13: ffff88810e236300 R14: ffff888109090000 R15:
0000000000000000
[ 146.134197] FS: 0000000000000000(0000) GS:ffff888116000000(0000)
knlGS:0000000000000000
[ 146.134206] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
[ 146.134215] CR2: 00007f60547d9100 CR3: 0000000029216002 CR4:
00000000000206e0
[ 146.134223] Call Trace:
[ 146.134245] ast_cursor_page_flip+0x3e/0x150 [ast]
[ 146.134272] ast_cursor_plane_helper_atomic_update+0x8a/0xc0 [ast]
[ 146.134300] drm_atomic_helper_commit_planes+0x197/0x4c0
[ 146.134341] drm_atomic_helper_commit_tail_rpm+0x51/0x90
[ 146.134357] commit_tail+0x103/0x1c0
[ 146.134390] process_one_work+0x56a/0xa60
[ 146.134431] ? __lock_acquired+0x1ca/0x3d0
[ 146.134447] ? pwq_dec_nr_in_flight+0x110/0x110
[ 146.134460] ? __lock_contended+0x4a0/0x4a0
[ 146.134491] ? worker_thread+0x150/0x620
[ 146.134521] worker_thread+0x8b/0x620
[ 146.134539] ? _raw_spin_unlock_irqrestore+0x41/0x50
[ 146.134583] ? process_one_work+0xa60/0xa60
[ 146.134597] kthread+0x1e4/0x210
[ 146.134612] ? kthread_create_worker_on_cpu+0xb0/0xb0
[ 146.134637] ret_from_fork+0x22/0x30
[ 146.134698] irq event stamp: 74111
[ 146.134711] hardirqs last enabled at (74117): [<ffffffff971c68f9>]
console_unlock+0x539/0x670
[ 146.134723] hardirqs last disabled at (74122): [<ffffffff971c68ef>]
console_unlock+0x52f/0x670
[ 146.134737] softirqs last enabled at (73354): [<ffffffff975469d5>]
wb_workfn+0x3f5/0x430
[ 146.134749] softirqs last disabled at (73350): [<ffffffff973f81d0>]
wb_wakeup_delayed+0x40/0xa0
[ 146.134758] ---[ end trace 74dd5fac6a3a2c0c ]---Happens with ast when doing
weston-launch
Quoted 18 lines
drivers/gpu/drm/drm_gem_vram_helper.c +6
-1+return 0 ; + +return gbo->bo.mem.start; +} +/** * drm_gem_vram_offset() - \ Returns a GEM VRAM object's offset in video memory @@ -297,7 +306,7 @@ s64 drm_gem_vram_offset(struct drm_gem_vram_object *gbo) {if (WARN_ON_ONCE (!gbo->pin_count))return (s64)-ENODEV ; -return gbo->bo.offset; +return drm_gem_vram_pg_offset (gbo) <<PAGE_SHIFT ; }EXPORT_SYMBOL (drm_gem_vram_offset);
Signature · 6 lines
Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Maxfeldstr. 5, 90409 Nürnberg, Germany (HRB 36809, AG Nürnberg) Geschäftsführer: Felix Imendörffer
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Christian König
maintainerRe: [PATCH 6/8] drm/vram-helper: don't use ttm bo->offset v4
Hi Thomas,
Am 17.09.20 um 12:51 schrieb Thomas Zimmermann:
Quoted 20 lines
Hi
Am 24.06.20 um 20:26 schrieb Nirmoy Das:
Quoted 17 lines
Calculate GEM VRAM bo's offset within vram-helper without depending on
bo->offset.Signed-off-by Nirmoy Das <[email protected]>Reviewed-by Daniel Vetter <[email protected]>--- drivers/gpu/drm/drm_gem_vram_helper.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)drivers/gpu/drm/drm_gem_vram_helper.c +0
-0@@ -281,6 +281,15 @@ u64 drm_gem_vram_mmap_offset(struct drm_gem_vram_object *gbo) }EXPORT_SYMBOL (drm_gem_vram_mmap_offset);
Quoted 5 lines
drivers/gpu/drm/drm_gem_vram_helper.c u64 drm_gem_vram_mmap_offset(struct drm_gem_vram_object *gbo) · line 287
Quoted 4 lines
drivers/gpu/drm/drm_gem_vram_helper.c +4
-0+static u64 drm_gem_vram_pg_offset (struct drm_gem_vram_object *gbo) +{ +/* Keep TTM behavior for now, remove when drivers are audited */ +if (WARN_ON_ONCE (!gbo->bo.mem.mm_node))At this line I got
Sounds like ast forgot to pin the cursor to VRAM.
If you look at ast_cursor_page_flip(), you see:
Quoted 3 lines
off =
drm_gem_vram_offset(gbo);
if (drm_WARN_ON_ONCE(dev, off < 0))
return; /* Bug: we didn't pin the cursor HW BO to VRAM. */
The drm_WARN_ON_ONCE() just never triggered before because it checks for the wrong condition (off < 0).
Regards,
Christian.
Quoted 80 lines
[ 146.133821] ------------[ cut here ]------------ [ 146.133872] WARNING: CPU: 6 PID: 7 at drivers/gpu/drm/drm_gem_vram_helper.c:284 drm_gem_vram_offset+0x59/0x60 [drm_vram_helper] [ 146.133880] Modules linked in: fuse(E) af_packet(E) ebtable_filter(E) ebtables(E) ip6table_filter(E) ip6_tables(E) iptable_filter(E) ip_tables(E) x_tables(E) bpfilter(E) rfkill(E) dmi_sysfs(E) msr(E) intel_powerclamp(E) coretemp(E) kv) [ 146.134051] scsi_dh_emc(E) scsi_dh_alua(E) [ 146.134074] CPU: 6 PID: 7 Comm: kworker/u48:0 Tainted: G E 5.9.0-rc4-1-default+ #492 [ 146.134083] Hardware name: Sun Microsystems SUN FIRE X2270 M2/SUN FIRE X2270 M2, BIOS 2.05 07/01/2010 [ 146.134099] Workqueue: events_unbound commit_work [ 146.134116] RIP: 0010:drm_gem_vram_offset+0x59/0x60 [drm_vram_helper] [ 146.134128] Code: 02 00 00 00 74 24 48 8d bb 80 02 00 00 e8 ef 27 17 d7 48 8b 83 80 02 00 00 5b 48 c1 e0 0c c3 0f 0b 48 c7 c0 ed ff ff ff 5b c3 <0f> 0b 31 c0 5b c3 90 66 66 66 66 90 41 56 41 55 49 89 d5 41 54 49 [ 146.134137] RSP: 0018:ffffc90000107c38 EFLAGS: 00010246 [ 146.134149] RAX: 0000000000000000 RBX: ffff888111155000 RCX: ffffffffc032323b [ 146.134158] RDX: dffffc0000000000 RSI: ffff88810e236300 RDI: ffff888111155278 [ 146.134168] RBP: ffff888109090000 R08: ffffffffc0323225 R09: 0000000000000002 [ 146.134177] R10: ffffed1020675020 R11: 0000000000000001 R12: ffff888109091050 [ 146.134187] R13: ffff88810e236300 R14: ffff888109090000 R15: 0000000000000000 [ 146.134197] FS: 0000000000000000(0000) GS:ffff888116000000(0000) knlGS:0000000000000000 [ 146.134206] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 146.134215] CR2: 00007f60547d9100 CR3: 0000000029216002 CR4: 00000000000206e0 [ 146.134223] Call Trace: [ 146.134245] ast_cursor_page_flip+0x3e/0x150 [ast] [ 146.134272] ast_cursor_plane_helper_atomic_update+0x8a/0xc0 [ast] [ 146.134300] drm_atomic_helper_commit_planes+0x197/0x4c0 [ 146.134341] drm_atomic_helper_commit_tail_rpm+0x51/0x90 [ 146.134357] commit_tail+0x103/0x1c0 [ 146.134390] process_one_work+0x56a/0xa60 [ 146.134431] ? __lock_acquired+0x1ca/0x3d0 [ 146.134447] ? pwq_dec_nr_in_flight+0x110/0x110 [ 146.134460] ? __lock_contended+0x4a0/0x4a0 [ 146.134491] ? worker_thread+0x150/0x620 [ 146.134521] worker_thread+0x8b/0x620 [ 146.134539] ? _raw_spin_unlock_irqrestore+0x41/0x50 [ 146.134583] ? process_one_work+0xa60/0xa60 [ 146.134597] kthread+0x1e4/0x210 [ 146.134612] ? kthread_create_worker_on_cpu+0xb0/0xb0 [ 146.134637] ret_from_fork+0x22/0x30 [ 146.134698] irq event stamp: 74111 [ 146.134711] hardirqs last enabled at (74117): [<ffffffff971c68f9>] console_unlock+0x539/0x670 [ 146.134723] hardirqs last disabled at (74122): [<ffffffff971c68ef>] console_unlock+0x52f/0x670 [ 146.134737] softirqs last enabled at (73354): [<ffffffff975469d5>] wb_workfn+0x3f5/0x430 [ 146.134749] softirqs last disabled at (73350): [<ffffffff973f81d0>] wb_wakeup_delayed+0x40/0xa0 [ 146.134758] ---[ end trace 74dd5fac6a3a2c0c ]---Happens with ast when doing
weston-launch
Quoted 10 lines
drivers/gpu/drm/drm_gem_vram_helper.c +5
-0+return 0 ; + +return gbo->bo.mem.start; +} +/** * drm_gem_vram_offset() - \ Returns a GEM VRAM object's offset in video memory @@ -297,7 +306,7 @@ s64 drm_gem_vram_offset(struct drm_gem_vram_object *gbo) {
Quoted 8 lines
drivers/gpu/drm/drm_gem_vram_helper.c s64 drm_gem_vram_offset(struct drm_gem_vram_object *gbo) · line 312
Quoted 8 lines
drivers/gpu/drm/drm_gem_vram_helper.c +1
-1if (WARN_ON_ONCE (!gbo->pin_count))return (s64)-ENODEV ; -return gbo->bo.offset; +return drm_gem_vram_pg_offset (gbo) <<PAGE_SHIFT ; }EXPORT_SYMBOL (drm_gem_vram_offset);
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerRe: [PATCH 6/8] drm/vram-helper: don't use ttm bo->offset v4
Hi Christian
Am 17.09.20 um 13:12 schrieb Christian König:
Quoted 32 lines
Hi Thomas,
Am 17.09.20 um 12:51 schrieb Thomas Zimmermann:
Quoted 12 lines
Hi
Am 24.06.20 um 20:26 schrieb Nirmoy Das:
Quoted 9 lines
Calculate GEM VRAM bo's offset within vram-helper without depending on
bo->offset.Signed-off-by Nirmoy Das <[email protected]>Reviewed-by Daniel Vetter <[email protected]>---
drivers/gpu/drm/drm_gem_vram_helper.c| 11 ++++++++++-1 file changed, 10 insertions(+), 1 deletion(-)Quoted 14 lines
drivers/gpu/drm/drm_gem_vram_helper.c u64 drm_gem_vram_mmap_offset(struct · line 287
Quoted 13 lines
drivers/gpu/drm/drm_gem_vram_helper.c +3
-0@@ -281,6 +281,15 @@ u64 drm_gem_vram_mmap_offset(struct drm_gem_vram_object *gbo) } EXPORT_SYMBOL(drm_gem_vram_mmap_offset); +static u64 drm_gem_vram_pg_offset(struct drm_gem_vram_object *gbo) +{ + /* Keep TTM behavior for now, remove when drivers are audited */ + if (WARN_ON_ONCE(!gbo->bo.mem.mm_node))At this line I got
Sounds like ast forgot to pin the cursor to VRAM.
Quoted 8 lines
If you look at
ast_cursor_page_flip(), you see:Quoted 4 lines
off =
drm_gem_vram_offset(gbo);
if (drm_WARN_ON_ONCE(dev, off < 0))
return; /* Bug: we didn't pin the cursor HW BO to VRAM. */The
drm_WARN_ON_ONCE()just never triggered before because it checks for the wrong condition (off < 0).
GEM VRAM BOs have a pin counter. drm_gem_vram_offset() returns -ENODEV if the BO's pin count is 0 (i.e., the BO has not been pinned anywhere). That's what we're testing here. Two cursor BOs are permanently pinned to the top of VRAM memory by ast_cursor_init(). If perma-pinning in ast_cursor_init() fails, driver initialization should fail entirely.
These cursor BOs do some sort of double buffering, On successful initialization, the actual cursor image is later blit-ed into one of the BOs.
All this used to work from what I can tell. Is there any chance that the recent TTM refactoring broke this?
Best regards
Thomas
Quoted 97 lines
Regards,
Christian.Quoted 80 lines
[ 146.133821] ------------[ cut here ]------------
[ 146.133872] WARNING: CPU: 6 PID: 7 atdrivers/gpu/drm/drm_gem_vram_helper.c:284drm_gem_vram_offset+0x59/0x60[drm_vram_helper]
[ 146.133880] Modules linked in: fuse(E)af_packet(E)ebtable_filter(E)ebtables(E)ip6table_filter(E)ip6_tables(E)iptable_filter(E)ip_tables(E)x_tables(E)bpfilter(E) rfkill(E)dmi_sysfs(E)msr(E)intel_powerclamp(E)coretemp(E) kv)
[ 146.134051]scsi_dh_emc(E)scsi_dh_alua(E)
[ 146.134074] CPU: 6 PID: 7 Comm: kworker/u48:0 Tainted: G E 5.9.0-rc4-1-default+ #492
[ 146.134083] Hardware name: Sun Microsystems SUN FIRE X2270 M2/SUN FIRE X2270 M2, BIOS 2.05 07/01/2010
[ 146.134099] Workqueue:events_unboundcommit_work
[ 146.134116] RIP: 0010:drm_gem_vram_offset+0x59/0x60 [drm_vram_helper] [ 146.134128] Code: 02 00 00 00 74 24 48 8d bb 80 02 00 00 e8 ef 27 17 d7 48 8b 83 80 02 00 00 5b 48 c1 e0 0c c3 0f 0b 48 c7 c0 ed ff ff ff 5b c3 <0f> 0b 31 c0 5b c3 90 66 66 66 66 90 41 56 41 55 49 89 d5 41 54 49 [ 146.134137] RSP: 0018:ffffc90000107c38 EFLAGS: 00010246
[ 146.134149] RAX: 0000000000000000 RBX:ffff888111155000RCX:ffffffffc032323b
[ 146.134158] RDX:dffffc0000000000RSI:ffff88810e236300RDI:ffff888111155278
[ 146.134168] RBP:ffff888109090000R08:ffffffffc0323225R09:
0000000000000002
[ 146.134177] R10:ffffed1020675020R11: 0000000000000001 R12:ffff888109091050
[ 146.134187] R13:ffff88810e236300R14:ffff888109090000R15:
0000000000000000
[ 146.134197] FS: 0000000000000000(0000) GS:ffff888116000000(0000) knlGS:0000000000000000
[ 146.134206] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 146.134215] CR2:00007f60547d9100CR3: 0000000029216002 CR4:00000000000206e0
[ 146.134223] Call Trace:
[ 146.134245]ast_cursor_page_flip+0x3e/0x150[ast]
[ 146.134272]ast_cursor_plane_helper_atomic_update+0x8a/0xc0[ast] [ 146.134300]drm_atomic_helper_commit_planes+0x197/0x4c0[ 146.134341]drm_atomic_helper_commit_tail_rpm+0x51/0x90[ 146.134357]commit_tail+0x103/0x1c0
[ 146.134390]process_one_work+0x56a/0xa60
[ 146.134431] ?__lock_acquired+0x1ca/0x3d0
[ 146.134447] ?pwq_dec_nr_in_flight+0x110/0x110
[ 146.134460] ?__lock_contended+0x4a0/0x4a0
[ 146.134491] ?worker_thread+0x150/0x620
[ 146.134521]worker_thread+0x8b/0x620
[ 146.134539] ?_raw_spin_unlock_irqrestore+0x41/0x50
[ 146.134583] ?process_one_work+0xa60/0xa60
[ 146.134597]kthread+0x1e4/0x210
[ 146.134612] ?kthread_create_worker_on_cpu+0xb0/0xb0
[ 146.134637]ret_from_fork+0x22/0x30
[ 146.134698] irq event stamp: 74111
[ 146.134711] hardirqs last enabled at (74117): [<ffffffff971c68f9>]console_unlock+0x539/0x670
[ 146.134723] hardirqs last disabled at (74122): [<ffffffff971c68ef>]console_unlock+0x52f/0x670
[ 146.134737] softirqs last enabled at (73354): [<ffffffff975469d5>]wb_workfn+0x3f5/0x430
[ 146.134749] softirqs last disabled at (73350): [<ffffffff973f81d0>]wb_wakeup_delayed+0x40/0xa0
[ 146.134758] ---[ end trace74dd5fac6a3a2c0c]---Happens with ast when doing
weston-launch
Quoted 10 lines
drivers/gpu/drm/drm_gem_vram_helper.c +5
-0+ return 0; + + return gbo->bo.mem.start; +} + /*** drm_gem_vram_offset() - \ Returns a GEM VRAM object's offset in video memory
drivers/gpu/drm/drm_gem_vram_helper.c +0
-0@@ -297,7 +306,7 @@ s64 drm_gem_vram_offset(struct drm_gem_vram_object *gbo)Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/drm_gem_vram_helper.c +1
-1{ if (WARN_ON_ONCE(!gbo->pin_count)) return (s64)-ENODEV; - return gbo->bo.offset; + return drm_gem_vram_pg_offset(gbo) << PAGE_SHIFT; } EXPORT_SYMBOL(drm_gem_vram_offset);_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Signature · 6 lines
Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Maxfeldstr. 5, 90409 Nürnberg, Germany (HRB 36809, AG Nürnberg) Geschäftsführer: Felix Imendörffer
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Christian König
maintainerRe: [PATCH 6/8] drm/vram-helper: don't use ttm bo->offset v4
Am 17.09.20 um 14:29 schrieb Thomas Zimmermann:
Quoted 47 lines
Hi Christian
Am 17.09.20 um 13:12 schrieb Christian König:
Quoted 31 lines
Hi Thomas,
Am 17.09.20 um 12:51 schrieb Thomas Zimmermann:
Quoted 12 lines
Hi
Am 24.06.20 um 20:26 schrieb Nirmoy Das:
Quoted 9 lines
Calculate GEM VRAM bo's offset within vram-helper without depending on
bo->offset.Signed-off-by Nirmoy Das <[email protected]>Reviewed-by Daniel Vetter <[email protected]>--- drivers/gpu/drm/drm_gem_vram_helper.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)Quoted 14 lines
drivers/gpu/drm/drm_gem_vram_helper.c u64 drm_gem_vram_mmap_offset(struct · line 287
Quoted 13 lines
drivers/gpu/drm/drm_gem_vram_helper.c +3
-0@@ -281,6 +281,15 @@ u64 drm_gem_vram_mmap_offset(struct drm_gem_vram_object *gbo) } EXPORT_SYMBOL(drm_gem_vram_mmap_offset); +static u64 drm_gem_vram_pg_offset(struct drm_gem_vram_object *gbo) +{ + /* Keep TTM behavior for now, remove when drivers are audited */ + if (WARN_ON_ONCE(!gbo->bo.mem.mm_node))At this line I got
Sounds like ast forgot to pin the cursor to VRAM.
Quoted 7 lines
If you look at
ast_cursor_page_flip(), you see:Quoted 4 lines
off =
drm_gem_vram_offset(gbo);
if (drm_WARN_ON_ONCE(dev, off < 0))
return; /* Bug: we didn't pin the cursor HW BO to
VRAM. */The
drm_WARN_ON_ONCE()just never triggered before because it checks for the wrong condition (off < 0).GEM VRAM BOs have a pin counter.
drm_gem_vram_offset()returns-ENODEVif the BO's pin count is 0 (i.e., the BO has not been pinned anywhere). That's what we're testing here. Two cursor BOs are permanently pinned to the top of VRAM memory byast_cursor_init(). If perma-pinning inast_cursor_init()fails, driver initialization should fail entirely.
Quoted 6 lines
These cursor BOs do some sort of double buffering, On successful initialization, the actual cursor image is later blit-ed into one of the BOs.
All this used to work from what I can tell. Is there any chance that the recent TTM refactoring broke this?
Yeah, certainly possible. If you have time please bisect.
Thanks,
Christian.
Quoted 98 lines
Best regards
ThomasQuoted 94 lines
Regards,
Christian.Quoted 79 lines
[ 146.133821] ------------[ cut here ]------------
[ 146.133872] WARNING: CPU: 6 PID: 7 atdrivers/gpu/drm/drm_gem_vram_helper.c:284drm_gem_vram_offset+0x59/0x60[drm_vram_helper]
[ 146.133880] Modules linked in: fuse(E)af_packet(E)ebtable_filter(E)ebtables(E)ip6table_filter(E)ip6_tables(E)iptable_filter(E)ip_tables(E)x_tables(E)bpfilter(E) rfkill(E)dmi_sysfs(E)msr(E)intel_powerclamp(E)coretemp(E) kv)
[ 146.134051]scsi_dh_emc(E)scsi_dh_alua(E)
[ 146.134074] CPU: 6 PID: 7 Comm: kworker/u48:0 Tainted: G E
5.9.0-rc4-1-default+ #492
[ 146.134083] Hardware name: Sun Microsystems SUN FIRE X2270 M2/SUN FIRE X2270 M2, BIOS 2.05 07/01/2010
[ 146.134099] Workqueue:events_unboundcommit_work
[ 146.134116] RIP: 0010:drm_gem_vram_offset+0x59/0x60 [drm_vram_helper] [ 146.134128] Code: 02 00 00 00 74 24 48 8d bb 80 02 00 00 e8 ef 27 17 d7 48 8b 83 80 02 00 00 5b 48 c1 e0 0c c3 0f 0b 48 c7 c0 ed ff ff ff 5b c3 <0f> 0b 31 c0 5b c3 90 66 66 66 66 90 41 56 41 55 49 89 d5 41 54 49 [ 146.134137] RSP: 0018:ffffc90000107c38 EFLAGS: 00010246
[ 146.134149] RAX: 0000000000000000 RBX:ffff888111155000RCX:ffffffffc032323b
[ 146.134158] RDX:dffffc0000000000RSI:ffff88810e236300RDI:ffff888111155278
[ 146.134168] RBP:ffff888109090000R08:ffffffffc0323225R09:
0000000000000002
[ 146.134177] R10:ffffed1020675020R11: 0000000000000001 R12:ffff888109091050
[ 146.134187] R13:ffff88810e236300R14:ffff888109090000R15:
0000000000000000
[ 146.134197] FS: 0000000000000000(0000) GS:ffff888116000000(0000) knlGS:0000000000000000
[ 146.134206] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 146.134215] CR2:00007f60547d9100CR3: 0000000029216002 CR4:00000000000206e0
[ 146.134223] Call Trace:
[ 146.134245]ast_cursor_page_flip+0x3e/0x150[ast]
[ 146.134272]ast_cursor_plane_helper_atomic_update+0x8a/0xc0[ast] [ 146.134300]drm_atomic_helper_commit_planes+0x197/0x4c0[ 146.134341]drm_atomic_helper_commit_tail_rpm+0x51/0x90[ 146.134357]commit_tail+0x103/0x1c0
[ 146.134390]process_one_work+0x56a/0xa60
[ 146.134431] ?__lock_acquired+0x1ca/0x3d0
[ 146.134447] ?pwq_dec_nr_in_flight+0x110/0x110
[ 146.134460] ?__lock_contended+0x4a0/0x4a0
[ 146.134491] ?worker_thread+0x150/0x620
[ 146.134521]worker_thread+0x8b/0x620
[ 146.134539] ?_raw_spin_unlock_irqrestore+0x41/0x50
[ 146.134583] ?process_one_work+0xa60/0xa60
[ 146.134597]kthread+0x1e4/0x210
[ 146.134612] ?kthread_create_worker_on_cpu+0xb0/0xb0
[ 146.134637]ret_from_fork+0x22/0x30
[ 146.134698] irq event stamp: 74111
[ 146.134711] hardirqs last enabled at (74117): [<ffffffff971c68f9>]console_unlock+0x539/0x670
[ 146.134723] hardirqs last disabled at (74122): [<ffffffff971c68ef>]console_unlock+0x52f/0x670
[ 146.134737] softirqs last enabled at (73354): [<ffffffff975469d5>]wb_workfn+0x3f5/0x430
[ 146.134749] softirqs last disabled at (73350): [<ffffffff973f81d0>]wb_wakeup_delayed+0x40/0xa0
[ 146.134758] ---[ end trace74dd5fac6a3a2c0c]---Happens with ast when doing
weston-launch
Quoted 10 lines
drivers/gpu/drm/drm_gem_vram_helper.c +5
-0+ return 0; + + return gbo->bo.mem.start; +} + /*** drm_gem_vram_offset() - \ Returns a GEM VRAM object's offset in video memory @@ -297,7 +306,7 @@ s64 drm_gem_vram_offset(struct drm_gem_vram_object *gbo)Quoted 8 lines
drivers/gpu/drm/drm_gem_vram_helper.c s64 drm_gem_vram_offset(struct drm_gem_vram_object *gbo) · line 311
Quoted 8 lines
drivers/gpu/drm/drm_gem_vram_helper.c +1
-1{ if (WARN_ON_ONCE(!gbo->pin_count)) return (s64)-ENODEV; - return gbo->bo.offset; + return drm_gem_vram_pg_offset(gbo) << PAGE_SHIFT; } EXPORT_SYMBOL(drm_gem_vram_offset);_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerRe: [PATCH 6/8] drm/vram-helper: don't use ttm bo->offset v4
Hi
Am 17.09.20 um 14:32 schrieb Christian König:
Quoted 48 lines
Am 17.09.20 um 14:29 schrieb Thomas Zimmermann:
Quoted 47 lines
Hi Christian
Am 17.09.20 um 13:12 schrieb Christian König:
Quoted 31 lines
Hi Thomas,
Am 17.09.20 um 12:51 schrieb Thomas Zimmermann:
Quoted 12 lines
Hi
Am 24.06.20 um 20:26 schrieb Nirmoy Das:
Quoted 9 lines
Calculate GEM VRAM bo's offset within vram-helper without depending on
bo->offset.Signed-off-by Nirmoy Das <[email protected]>Reviewed-by Daniel Vetter <[email protected]>---
drivers/gpu/drm/drm_gem_vram_helper.c| 11 ++++++++++-1 file changed, 10 insertions(+), 1 deletion(-)Quoted 14 lines
drivers/gpu/drm/drm_gem_vram_helper.c u64 drm_gem_vram_mmap_offset(struct · line 287
Quoted 13 lines
drivers/gpu/drm/drm_gem_vram_helper.c +3
-0@@ -281,6 +281,15 @@ u64 drm_gem_vram_mmap_offset(struct drm_gem_vram_object *gbo) } EXPORT_SYMBOL(drm_gem_vram_mmap_offset); +static u64 drm_gem_vram_pg_offset(struct drm_gem_vram_object *gbo) +{ + /* Keep TTM behavior for now, remove when drivers are audited */ + if (WARN_ON_ONCE(!gbo->bo.mem.mm_node))At this line I got
Sounds like ast forgot to pin the cursor to VRAM.
Quoted 7 lines
If you look at
ast_cursor_page_flip(), you see:Quoted 4 lines
off =
drm_gem_vram_offset(gbo);
if (drm_WARN_ON_ONCE(dev, off < 0))
return; /* Bug: we didn't pin the cursor HW BO to VRAM. */The
drm_WARN_ON_ONCE()just never triggered before because it checks for the wrong condition (off < 0).GEM VRAM BOs have a pin counter.
drm_gem_vram_offset()returns-ENODEVif the BO's pin count is 0 (i.e., the BO has not been pinned anywhere). That's what we're testing here. Two cursor BOs are permanently pinned to the top of VRAM memory byast_cursor_init(). If perma-pinning inast_cursor_init()fails, driver initialization should fail entirely.
Quoted 8 lines
Quoted 6 lines
These cursor BOs do some sort of double buffering, On successful initialization, the actual cursor image is later blit-ed into one of the BOs.
All this used to work from what I can tell. Is there any chance that the recent TTM refactoring broke this?
Yeah, certainly possible. If you have time please bisect.
FYI the bug is not in c44264f9f729 ("Merge tag 'v5.8' into drm-next") from Aug 11. I'll try to bisect.
Best regards
Thomas
Quoted 110 lines
Thanks,
Christian.Quoted 101 lines
Best regards
ThomasQuoted 97 lines
Regards,
Christian.Quoted 82 lines
[ 146.133821] ------------[ cut here ]------------
[ 146.133872] WARNING: CPU: 6 PID: 7 atdrivers/gpu/drm/drm_gem_vram_helper.c:284drm_gem_vram_offset+0x59/0x60[drm_vram_helper]
[ 146.133880] Modules linked in: fuse(E)af_packet(E)ebtable_filter(E)
ebtables(E)ip6table_filter(E)ip6_tables(E)iptable_filter(E)ip_tables(E)x_tables(E)bpfilter(E) rfkill(E)dmi_sysfs(E)msr(E)intel_powerclamp(E)coretemp(E) kv)
[ 146.134051]scsi_dh_emc(E)scsi_dh_alua(E)
[ 146.134074] CPU: 6 PID: 7 Comm: kworker/u48:0 Tainted:
G E
5.9.0-rc4-1-default+ #492
[ 146.134083] Hardware name: Sun Microsystems SUN FIRE X2270 M2/SUN FIRE X2270 M2, BIOS 2.05 07/01/2010
[ 146.134099] Workqueue:events_unboundcommit_work
[ 146.134116] RIP: 0010:drm_gem_vram_offset+0x59/0x60 [drm_vram_helper]
[ 146.134128] Code: 02 00 00 00 74 24 48 8d bb 80 02 00 00 e8 ef 27 17 d7 48 8b 83 80 02 00 00 5b 48 c1 e0 0c c3 0f 0b 48 c7 c0 ed ff ff ff 5b c3 <0f> 0b 31 c0 5b c3 90 66 66 66 66 90 41 56 41 55 49 89 d5 41 54 49 [ 146.134137] RSP: 0018:ffffc90000107c38 EFLAGS: 00010246
[ 146.134149] RAX: 0000000000000000 RBX:ffff888111155000RCX:ffffffffc032323b
[ 146.134158] RDX:dffffc0000000000RSI:ffff88810e236300RDI:ffff888111155278
[ 146.134168] RBP:ffff888109090000R08:ffffffffc0323225R09:
0000000000000002
[ 146.134177] R10:ffffed1020675020R11: 0000000000000001 R12:ffff888109091050
[ 146.134187] R13:ffff88810e236300R14:ffff888109090000R15:
0000000000000000
[ 146.134197] FS: 0000000000000000(0000) GS:ffff888116000000(0000) knlGS:0000000000000000
[ 146.134206] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 146.134215] CR2:00007f60547d9100CR3: 0000000029216002 CR4:00000000000206e0
[ 146.134223] Call Trace:
[ 146.134245]ast_cursor_page_flip+0x3e/0x150[ast]
[ 146.134272]ast_cursor_plane_helper_atomic_update+0x8a/0xc0[ast] [ 146.134300]drm_atomic_helper_commit_planes+0x197/0x4c0[ 146.134341]drm_atomic_helper_commit_tail_rpm+0x51/0x90[ 146.134357]commit_tail+0x103/0x1c0
[ 146.134390]process_one_work+0x56a/0xa60
[ 146.134431] ?__lock_acquired+0x1ca/0x3d0
[ 146.134447] ?pwq_dec_nr_in_flight+0x110/0x110
[ 146.134460] ?__lock_contended+0x4a0/0x4a0
[ 146.134491] ?worker_thread+0x150/0x620
[ 146.134521]worker_thread+0x8b/0x620
[ 146.134539] ?_raw_spin_unlock_irqrestore+0x41/0x50
[ 146.134583] ?process_one_work+0xa60/0xa60
[ 146.134597]kthread+0x1e4/0x210
[ 146.134612] ?kthread_create_worker_on_cpu+0xb0/0xb0
[ 146.134637]ret_from_fork+0x22/0x30
[ 146.134698] irq event stamp: 74111
[ 146.134711] hardirqs last enabled at (74117): [<ffffffff971c68f9>]console_unlock+0x539/0x670
[ 146.134723] hardirqs last disabled at (74122): [<ffffffff971c68ef>]console_unlock+0x52f/0x670
[ 146.134737] softirqs last enabled at (73354): [<ffffffff975469d5>]wb_workfn+0x3f5/0x430
[ 146.134749] softirqs last disabled at (73350): [<ffffffff973f81d0>]wb_wakeup_delayed+0x40/0xa0
[ 146.134758] ---[ end trace74dd5fac6a3a2c0c]---Happens with ast when doing
weston-launch
Quoted 10 lines
drivers/gpu/drm/drm_gem_vram_helper.c +5
-0+ return 0; + + return gbo->bo.mem.start; +} + /*** drm_gem_vram_offset() - \ Returns a GEM VRAM object's offset in video memory
drivers/gpu/drm/drm_gem_vram_helper.c +0
-0@@ -297,7 +306,7 @@ s64 drm_gem_vram_offset(struct drm_gem_vram_object *gbo)Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/drm_gem_vram_helper.c +1
-1{ if (WARN_ON_ONCE(!gbo->pin_count)) return (s64)-ENODEV; - return gbo->bo.offset; + return drm_gem_vram_pg_offset(gbo) << PAGE_SHIFT; } EXPORT_SYMBOL(drm_gem_vram_offset);_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Signature · 6 lines
Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Maxfeldstr. 5, 90409 Nürnberg, Germany (HRB 36809, AG Nürnberg) Geschäftsführer: Felix Imendörffer
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerRe: [PATCH 6/8] drm/vram-helper: don't use ttm bo->offset v4
In reply to Christian KönigHi
Am 17.09.20 um 14:32 schrieb Christian König:
Quoted 48 lines
Am 17.09.20 um 14:29 schrieb Thomas Zimmermann:
Quoted 47 lines
Hi Christian
Am 17.09.20 um 13:12 schrieb Christian König:
Quoted 31 lines
Hi Thomas,
Am 17.09.20 um 12:51 schrieb Thomas Zimmermann:
Quoted 12 lines
Hi
Am 24.06.20 um 20:26 schrieb Nirmoy Das:
Quoted 9 lines
Calculate GEM VRAM bo's offset within vram-helper without depending on
bo->offset.Signed-off-by Nirmoy Das <[email protected]>Reviewed-by Daniel Vetter <[email protected]>---
drivers/gpu/drm/drm_gem_vram_helper.c| 11 ++++++++++-1 file changed, 10 insertions(+), 1 deletion(-)Quoted 14 lines
drivers/gpu/drm/drm_gem_vram_helper.c u64 drm_gem_vram_mmap_offset(struct · line 287
Quoted 13 lines
drivers/gpu/drm/drm_gem_vram_helper.c +3
-0@@ -281,6 +281,15 @@ u64 drm_gem_vram_mmap_offset(struct drm_gem_vram_object *gbo) } EXPORT_SYMBOL(drm_gem_vram_mmap_offset); +static u64 drm_gem_vram_pg_offset(struct drm_gem_vram_object *gbo) +{ + /* Keep TTM behavior for now, remove when drivers are audited */ + if (WARN_ON_ONCE(!gbo->bo.mem.mm_node))At this line I got
Sounds like ast forgot to pin the cursor to VRAM.
Quoted 7 lines
If you look at
ast_cursor_page_flip(), you see:Quoted 4 lines
off =
drm_gem_vram_offset(gbo);
if (drm_WARN_ON_ONCE(dev, off < 0))
return; /* Bug: we didn't pin the cursor HW BO to VRAM. */The
drm_WARN_ON_ONCE()just never triggered before because it checks for the wrong condition (off < 0).GEM VRAM BOs have a pin counter.
drm_gem_vram_offset()returns-ENODEVif the BO's pin count is 0 (i.e., the BO has not been pinned anywhere). That's what we're testing here. Two cursor BOs are permanently pinned to the top of VRAM memory byast_cursor_init(). If perma-pinning inast_cursor_init()fails, driver initialization should fail entirely.
Quoted 8 lines
Quoted 6 lines
These cursor BOs do some sort of double buffering, On successful initialization, the actual cursor image is later blit-ed into one of the BOs.
All this used to work from what I can tell. Is there any chance that the recent TTM refactoring broke this?
Yeah, certainly possible. If you have time please bisect.
Found it.
https://patchwork.freedesktop.org/patch/391418/
Best regards
Thomas
Quoted 110 lines
Thanks,
Christian.Quoted 101 lines
Best regards
ThomasQuoted 97 lines
Regards,
Christian.Quoted 82 lines
[ 146.133821] ------------[ cut here ]------------
[ 146.133872] WARNING: CPU: 6 PID: 7 atdrivers/gpu/drm/drm_gem_vram_helper.c:284drm_gem_vram_offset+0x59/0x60[drm_vram_helper]
[ 146.133880] Modules linked in: fuse(E)af_packet(E)ebtable_filter(E)
ebtables(E)ip6table_filter(E)ip6_tables(E)iptable_filter(E)ip_tables(E)x_tables(E)bpfilter(E) rfkill(E)dmi_sysfs(E)msr(E)intel_powerclamp(E)coretemp(E) kv)
[ 146.134051]scsi_dh_emc(E)scsi_dh_alua(E)
[ 146.134074] CPU: 6 PID: 7 Comm: kworker/u48:0 Tainted:
G E
5.9.0-rc4-1-default+ #492
[ 146.134083] Hardware name: Sun Microsystems SUN FIRE X2270 M2/SUN FIRE X2270 M2, BIOS 2.05 07/01/2010
[ 146.134099] Workqueue:events_unboundcommit_work
[ 146.134116] RIP: 0010:drm_gem_vram_offset+0x59/0x60 [drm_vram_helper]
[ 146.134128] Code: 02 00 00 00 74 24 48 8d bb 80 02 00 00 e8 ef 27 17 d7 48 8b 83 80 02 00 00 5b 48 c1 e0 0c c3 0f 0b 48 c7 c0 ed ff ff ff 5b c3 <0f> 0b 31 c0 5b c3 90 66 66 66 66 90 41 56 41 55 49 89 d5 41 54 49 [ 146.134137] RSP: 0018:ffffc90000107c38 EFLAGS: 00010246
[ 146.134149] RAX: 0000000000000000 RBX:ffff888111155000RCX:ffffffffc032323b
[ 146.134158] RDX:dffffc0000000000RSI:ffff88810e236300RDI:ffff888111155278
[ 146.134168] RBP:ffff888109090000R08:ffffffffc0323225R09:
0000000000000002
[ 146.134177] R10:ffffed1020675020R11: 0000000000000001 R12:ffff888109091050
[ 146.134187] R13:ffff88810e236300R14:ffff888109090000R15:
0000000000000000
[ 146.134197] FS: 0000000000000000(0000) GS:ffff888116000000(0000) knlGS:0000000000000000
[ 146.134206] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 146.134215] CR2:00007f60547d9100CR3: 0000000029216002 CR4:00000000000206e0
[ 146.134223] Call Trace:
[ 146.134245]ast_cursor_page_flip+0x3e/0x150[ast]
[ 146.134272]ast_cursor_plane_helper_atomic_update+0x8a/0xc0[ast] [ 146.134300]drm_atomic_helper_commit_planes+0x197/0x4c0[ 146.134341]drm_atomic_helper_commit_tail_rpm+0x51/0x90[ 146.134357]commit_tail+0x103/0x1c0
[ 146.134390]process_one_work+0x56a/0xa60
[ 146.134431] ?__lock_acquired+0x1ca/0x3d0
[ 146.134447] ?pwq_dec_nr_in_flight+0x110/0x110
[ 146.134460] ?__lock_contended+0x4a0/0x4a0
[ 146.134491] ?worker_thread+0x150/0x620
[ 146.134521]worker_thread+0x8b/0x620
[ 146.134539] ?_raw_spin_unlock_irqrestore+0x41/0x50
[ 146.134583] ?process_one_work+0xa60/0xa60
[ 146.134597]kthread+0x1e4/0x210
[ 146.134612] ?kthread_create_worker_on_cpu+0xb0/0xb0
[ 146.134637]ret_from_fork+0x22/0x30
[ 146.134698] irq event stamp: 74111
[ 146.134711] hardirqs last enabled at (74117): [<ffffffff971c68f9>]console_unlock+0x539/0x670
[ 146.134723] hardirqs last disabled at (74122): [<ffffffff971c68ef>]console_unlock+0x52f/0x670
[ 146.134737] softirqs last enabled at (73354): [<ffffffff975469d5>]wb_workfn+0x3f5/0x430
[ 146.134749] softirqs last disabled at (73350): [<ffffffff973f81d0>]wb_wakeup_delayed+0x40/0xa0
[ 146.134758] ---[ end trace74dd5fac6a3a2c0c]---Happens with ast when doing
weston-launch
Quoted 10 lines
drivers/gpu/drm/drm_gem_vram_helper.c +5
-0+ return 0; + + return gbo->bo.mem.start; +} + /*** drm_gem_vram_offset() - \ Returns a GEM VRAM object's offset in video memory
drivers/gpu/drm/drm_gem_vram_helper.c +0
-0@@ -297,7 +306,7 @@ s64 drm_gem_vram_offset(struct drm_gem_vram_object *gbo)Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/drm_gem_vram_helper.c +1
-1{ if (WARN_ON_ONCE(!gbo->pin_count)) return (s64)-ENODEV; - return gbo->bo.offset; + return drm_gem_vram_pg_offset(gbo) << PAGE_SHIFT; } EXPORT_SYMBOL(drm_gem_vram_offset);_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Signature · 6 lines
Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Maxfeldstr. 5, 90409 Nürnberg, Germany (HRB 36809, AG Nürnberg) Geschäftsführer: Felix Imendörffer
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 6/8] drm/vram-helper: don't use ttm bo->offset v4
In reply to Thomas ZimmermannQuoted 47 lines · Thomas Zimmermann
Hi Christian
Am 17.09.20 um 13:12 schrieb Christian König:
Quoted 31 lines
Hi Thomas,
Am 17.09.20 um 12:51 schrieb Thomas Zimmermann:
Quoted 12 lines
Hi
Am 24.06.20 um 20:26 schrieb Nirmoy Das:
Quoted 9 lines
Calculate GEM VRAM bo's offset within vram-helper without depending on
bo->offset.Signed-off-by Nirmoy Das <[email protected]>Reviewed-by Daniel Vetter <[email protected]>--- drivers/gpu/drm/drm_gem_vram_helper.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)Quoted 14 lines
drivers/gpu/drm/drm_gem_vram_helper.c u64 drm_gem_vram_mmap_offset(struct · line 287
Quoted 13 lines
drivers/gpu/drm/drm_gem_vram_helper.c +3
-0@@ -281,6 +281,15 @@ u64 drm_gem_vram_mmap_offset(struct drm_gem_vram_object *gbo) } EXPORT_SYMBOL(drm_gem_vram_mmap_offset); +static u64 drm_gem_vram_pg_offset(struct drm_gem_vram_object *gbo) +{ + /* Keep TTM behavior for now, remove when drivers are audited */ + if (WARN_ON_ONCE(!gbo->bo.mem.mm_node))At this line I got
Sounds like ast forgot to pin the cursor to VRAM.
Quoted 7 lines
If you look at
ast_cursor_page_flip(), you see:Quoted 4 lines
off =
drm_gem_vram_offset(gbo);
if (drm_WARN_ON_ONCE(dev, off < 0))
return; /* Bug: we didn't pin the cursor HW BO to
VRAM. */The
drm_WARN_ON_ONCE()just never triggered before because it checks for the wrong condition (off < 0).GEM VRAM BOs have a pin counter.
drm_gem_vram_offset()returns-ENODEVif the BO's pin count is 0 (i.e., the BO has not been pinned anywhere). That's what we're testing here. Two cursor BOs are permanently pinned to the top of VRAM memory byast_cursor_init(). If perma-pinning inast_cursor_init()fails, driver initialization should fail entirely.
Quoted 6 lines
These cursor BOs do some sort of double buffering, On successful initialization, the actual cursor image is later blit-ed into one of the BOs.
All this used to work from what I can tell. Is there any chance that the recent TTM refactoring broke this?
In ast_cursor_blit(), cursor bo is pinned without any flags --> "drm_gem_vram_pin(gbo, 0);"
But in ast_cursor_init() both cursors are pinned with TOPDOWN and VRAM flag.
I wonder if that could cause any issue.
Regards,
Nirmoy
Quoted 98 lines
Best regards
ThomasQuoted 94 lines
Regards,
Christian.Quoted 79 lines
[ 146.133821] ------------[ cut here ]------------
[ 146.133872] WARNING: CPU: 6 PID: 7 atdrivers/gpu/drm/drm_gem_vram_helper.c:284drm_gem_vram_offset+0x59/0x60[drm_vram_helper]
[ 146.133880] Modules linked in: fuse(E)af_packet(E)ebtable_filter(E)ebtables(E)ip6table_filter(E)ip6_tables(E)iptable_filter(E)ip_tables(E)x_tables(E)bpfilter(E) rfkill(E)dmi_sysfs(E)msr(E)intel_powerclamp(E)coretemp(E) kv)
[ 146.134051]scsi_dh_emc(E)scsi_dh_alua(E)
[ 146.134074] CPU: 6 PID: 7 Comm: kworker/u48:0 Tainted: G E
5.9.0-rc4-1-default+ #492
[ 146.134083] Hardware name: Sun Microsystems SUN FIRE X2270 M2/SUN FIRE X2270 M2, BIOS 2.05 07/01/2010
[ 146.134099] Workqueue:events_unboundcommit_work
[ 146.134116] RIP: 0010:drm_gem_vram_offset+0x59/0x60 [drm_vram_helper] [ 146.134128] Code: 02 00 00 00 74 24 48 8d bb 80 02 00 00 e8 ef 27 17 d7 48 8b 83 80 02 00 00 5b 48 c1 e0 0c c3 0f 0b 48 c7 c0 ed ff ff ff 5b c3 <0f> 0b 31 c0 5b c3 90 66 66 66 66 90 41 56 41 55 49 89 d5 41 54 49 [ 146.134137] RSP: 0018:ffffc90000107c38 EFLAGS: 00010246
[ 146.134149] RAX: 0000000000000000 RBX:ffff888111155000RCX:ffffffffc032323b
[ 146.134158] RDX:dffffc0000000000RSI:ffff88810e236300RDI:ffff888111155278
[ 146.134168] RBP:ffff888109090000R08:ffffffffc0323225R09:
0000000000000002
[ 146.134177] R10:ffffed1020675020R11: 0000000000000001 R12:ffff888109091050
[ 146.134187] R13:ffff88810e236300R14:ffff888109090000R15:
0000000000000000
[ 146.134197] FS: 0000000000000000(0000) GS:ffff888116000000(0000) knlGS:0000000000000000
[ 146.134206] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 146.134215] CR2:00007f60547d9100CR3: 0000000029216002 CR4:00000000000206e0
[ 146.134223] Call Trace:
[ 146.134245]ast_cursor_page_flip+0x3e/0x150[ast]
[ 146.134272]ast_cursor_plane_helper_atomic_update+0x8a/0xc0[ast] [ 146.134300]drm_atomic_helper_commit_planes+0x197/0x4c0[ 146.134341]drm_atomic_helper_commit_tail_rpm+0x51/0x90[ 146.134357]commit_tail+0x103/0x1c0
[ 146.134390]process_one_work+0x56a/0xa60
[ 146.134431] ?__lock_acquired+0x1ca/0x3d0
[ 146.134447] ?pwq_dec_nr_in_flight+0x110/0x110
[ 146.134460] ?__lock_contended+0x4a0/0x4a0
[ 146.134491] ?worker_thread+0x150/0x620
[ 146.134521]worker_thread+0x8b/0x620
[ 146.134539] ?_raw_spin_unlock_irqrestore+0x41/0x50
[ 146.134583] ?process_one_work+0xa60/0xa60
[ 146.134597]kthread+0x1e4/0x210
[ 146.134612] ?kthread_create_worker_on_cpu+0xb0/0xb0
[ 146.134637]ret_from_fork+0x22/0x30
[ 146.134698] irq event stamp: 74111
[ 146.134711] hardirqs last enabled at (74117): [<ffffffff971c68f9>]console_unlock+0x539/0x670
[ 146.134723] hardirqs last disabled at (74122): [<ffffffff971c68ef>]console_unlock+0x52f/0x670
[ 146.134737] softirqs last enabled at (73354): [<ffffffff975469d5>]wb_workfn+0x3f5/0x430
[ 146.134749] softirqs last disabled at (73350): [<ffffffff973f81d0>]wb_wakeup_delayed+0x40/0xa0
[ 146.134758] ---[ end trace74dd5fac6a3a2c0c]---Happens with ast when doing
weston-launch
Quoted 10 lines
drivers/gpu/drm/drm_gem_vram_helper.c +5
-0+ return 0; + + return gbo->bo.mem.start; +} + /*** drm_gem_vram_offset() - \ Returns a GEM VRAM object's offset in video memory @@ -297,7 +306,7 @@ s64 drm_gem_vram_offset(struct drm_gem_vram_object *gbo)Quoted 8 lines
drivers/gpu/drm/drm_gem_vram_helper.c s64 drm_gem_vram_offset(struct drm_gem_vram_object *gbo) · line 311
Quoted 8 lines
drivers/gpu/drm/drm_gem_vram_helper.c +1
-1{ if (WARN_ON_ONCE(!gbo->pin_count)) return (s64)-ENODEV; - return gbo->bo.offset; + return drm_gem_vram_pg_offset(gbo) << PAGE_SHIFT; } EXPORT_SYMBOL(drm_gem_vram_offset);_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerRe: [PATCH 6/8] drm/vram-helper: don't use ttm bo->offset v4
Hi
Am 17.09.20 um 14:58 schrieb Nirmoy:
Quoted 57 lines · Thomas Zimmermann
Quoted 47 lines
Hi Christian
Am 17.09.20 um 13:12 schrieb Christian König:
Quoted 31 lines
Hi Thomas,
Am 17.09.20 um 12:51 schrieb Thomas Zimmermann:
Quoted 12 lines
Hi
Am 24.06.20 um 20:26 schrieb Nirmoy Das:
Quoted 9 lines
Calculate GEM VRAM bo's offset within vram-helper without depending on
bo->offset.Signed-off-by Nirmoy Das <[email protected]>Reviewed-by Daniel Vetter <[email protected]>---
drivers/gpu/drm/drm_gem_vram_helper.c| 11 ++++++++++-1 file changed, 10 insertions(+), 1 deletion(-)Quoted 14 lines
drivers/gpu/drm/drm_gem_vram_helper.c u64 drm_gem_vram_mmap_offset(struct · line 287
Quoted 13 lines
drivers/gpu/drm/drm_gem_vram_helper.c +3
-0@@ -281,6 +281,15 @@ u64 drm_gem_vram_mmap_offset(struct drm_gem_vram_object *gbo) } EXPORT_SYMBOL(drm_gem_vram_mmap_offset); +static u64 drm_gem_vram_pg_offset(struct drm_gem_vram_object *gbo) +{ + /* Keep TTM behavior for now, remove when drivers are audited */ + if (WARN_ON_ONCE(!gbo->bo.mem.mm_node))At this line I got
Sounds like ast forgot to pin the cursor to VRAM.
Quoted 7 lines
If you look at
ast_cursor_page_flip(), you see:Quoted 4 lines
off =
drm_gem_vram_offset(gbo);
if (drm_WARN_ON_ONCE(dev, off < 0))
return; /* Bug: we didn't pin the cursor HW BO to VRAM. */The
drm_WARN_ON_ONCE()just never triggered before because it checks for the wrong condition (off < 0).GEM VRAM BOs have a pin counter.
drm_gem_vram_offset()returns-ENODEVif the BO's pin count is 0 (i.e., the BO has not been pinned anywhere). That's what we're testing here. Two cursor BOs are permanently pinned to the top of VRAM memory byast_cursor_init(). If perma-pinning inast_cursor_init()fails, driver initialization should fail entirely.Quoted 6 lines
These cursor BOs do some sort of double buffering, On successful initialization, the actual cursor image is later blit-ed into one of the BOs.
All this used to work from what I can tell. Is there any chance that the recent TTM refactoring broke this?
Quoted 7 lines
In
ast_cursor_blit(), cursor bo is pinned without any flags --> "drm_gem_vram_pin(gbo, 0);"But in
ast_cursor_init()both cursors are pinned with TOPDOWN and VRAM flag.I wonder if that could cause any issue.
It shouldn't. The BO has been pinned already when blit is running. Only the pin count is being incremented.
Best regards
Thomas
Quoted 113 lines
Regards,
Nirmoy
Quoted 101 lines
Best regards
ThomasQuoted 97 lines
Regards,
Christian.Quoted 82 lines
[ 146.133821] ------------[ cut here ]------------
[ 146.133872] WARNING: CPU: 6 PID: 7 atdrivers/gpu/drm/drm_gem_vram_helper.c:284drm_gem_vram_offset+0x59/0x60[drm_vram_helper]
[ 146.133880] Modules linked in: fuse(E)af_packet(E)ebtable_filter(E)
ebtables(E)ip6table_filter(E)ip6_tables(E)iptable_filter(E)ip_tables(E)x_tables(E)bpfilter(E) rfkill(E)dmi_sysfs(E)msr(E)intel_powerclamp(E)coretemp(E) kv)
[ 146.134051]scsi_dh_emc(E)scsi_dh_alua(E)
[ 146.134074] CPU: 6 PID: 7 Comm: kworker/u48:0 Tainted:
G E
5.9.0-rc4-1-default+ #492
[ 146.134083] Hardware name: Sun Microsystems SUN FIRE X2270 M2/SUN FIRE X2270 M2, BIOS 2.05 07/01/2010
[ 146.134099] Workqueue:events_unboundcommit_work
[ 146.134116] RIP: 0010:drm_gem_vram_offset+0x59/0x60 [drm_vram_helper]
[ 146.134128] Code: 02 00 00 00 74 24 48 8d bb 80 02 00 00 e8 ef 27 17 d7 48 8b 83 80 02 00 00 5b 48 c1 e0 0c c3 0f 0b 48 c7 c0 ed ff ff ff 5b c3 <0f> 0b 31 c0 5b c3 90 66 66 66 66 90 41 56 41 55 49 89 d5 41 54 49 [ 146.134137] RSP: 0018:ffffc90000107c38 EFLAGS: 00010246
[ 146.134149] RAX: 0000000000000000 RBX:ffff888111155000RCX:ffffffffc032323b
[ 146.134158] RDX:dffffc0000000000RSI:ffff88810e236300RDI:ffff888111155278
[ 146.134168] RBP:ffff888109090000R08:ffffffffc0323225R09:
0000000000000002
[ 146.134177] R10:ffffed1020675020R11: 0000000000000001 R12:ffff888109091050
[ 146.134187] R13:ffff88810e236300R14:ffff888109090000R15:
0000000000000000
[ 146.134197] FS: 0000000000000000(0000) GS:ffff888116000000(0000) knlGS:0000000000000000
[ 146.134206] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 146.134215] CR2:00007f60547d9100CR3: 0000000029216002 CR4:00000000000206e0
[ 146.134223] Call Trace:
[ 146.134245]ast_cursor_page_flip+0x3e/0x150[ast]
[ 146.134272]ast_cursor_plane_helper_atomic_update+0x8a/0xc0[ast] [ 146.134300]drm_atomic_helper_commit_planes+0x197/0x4c0[ 146.134341]drm_atomic_helper_commit_tail_rpm+0x51/0x90[ 146.134357]commit_tail+0x103/0x1c0
[ 146.134390]process_one_work+0x56a/0xa60
[ 146.134431] ?__lock_acquired+0x1ca/0x3d0
[ 146.134447] ?pwq_dec_nr_in_flight+0x110/0x110
[ 146.134460] ?__lock_contended+0x4a0/0x4a0
[ 146.134491] ?worker_thread+0x150/0x620
[ 146.134521]worker_thread+0x8b/0x620
[ 146.134539] ?_raw_spin_unlock_irqrestore+0x41/0x50
[ 146.134583] ?process_one_work+0xa60/0xa60
[ 146.134597]kthread+0x1e4/0x210
[ 146.134612] ?kthread_create_worker_on_cpu+0xb0/0xb0
[ 146.134637]ret_from_fork+0x22/0x30
[ 146.134698] irq event stamp: 74111
[ 146.134711] hardirqs last enabled at (74117): [<ffffffff971c68f9>]console_unlock+0x539/0x670
[ 146.134723] hardirqs last disabled at (74122): [<ffffffff971c68ef>]console_unlock+0x52f/0x670
[ 146.134737] softirqs last enabled at (73354): [<ffffffff975469d5>]wb_workfn+0x3f5/0x430
[ 146.134749] softirqs last disabled at (73350): [<ffffffff973f81d0>]wb_wakeup_delayed+0x40/0xa0
[ 146.134758] ---[ end trace74dd5fac6a3a2c0c]---Happens with ast when doing
weston-launch
Quoted 10 lines
drivers/gpu/drm/drm_gem_vram_helper.c +5
-0+ return 0; + + return gbo->bo.mem.start; +} + /*** drm_gem_vram_offset() - \ Returns a GEM VRAM object's offset in video memory
drivers/gpu/drm/drm_gem_vram_helper.c +0
-0@@ -297,7 +306,7 @@ s64 drm_gem_vram_offset(struct drm_gem_vram_object *gbo)Quoted 8 lines
Quoted 8 lines
drivers/gpu/drm/drm_gem_vram_helper.c +1
-1{ if (WARN_ON_ONCE(!gbo->pin_count)) return (s64)-ENODEV; - return gbo->bo.offset; + return drm_gem_vram_pg_offset(gbo) << PAGE_SHIFT; } EXPORT_SYMBOL(drm_gem_vram_offset);_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Signature · 6 lines
Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Maxfeldstr. 5, 90409 Nürnberg, Germany (HRB 36809, AG Nürnberg) Geschäftsführer: Felix Imendörffer
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v6 7/8 drm/bochs: use drm_gem_vram_offset to get bo offset v2
In reply to Nirmoy DasSwitch over to GEM VRAM's implementation to retrieve bo->offset.
--- drivers/gpu/drm/bochs/bochs_kms.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/gpu/drm/bochs/bochs_kms.c +6 -1
@@ -29,16 +29,21 @@ static void bochs_plane_update(struct bochs_device *bochs, struct drm_plane_state *state) {struct drm_gem_vram_object *gbo; +s64 gpu_addr;if (!state->fb || !bochs->stride)return ; gbo =drm_gem_vram_of_gem (state->fb->obj[0 ]); + gpu_addr =drm_gem_vram_offset (gbo); +if (WARN_ON_ONCE (gpu_addr <0 )) +return ;/* Bug: we didn't pin the BO to VRAM in prepare_fb. */ +bochs_hw_setbase (bochs, state->crtc_x, state->crtc_y, state->fb->pitches[0 ], - state->fb->offsets[0 ] + gbo->bo.offset); + state->fb->offsets[0 ] + gpu_addr);bochs_hw_setformat (bochs, state->fb->format); }
Signature · 6 lines
2.27.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v6 8/8 drm/ttm: do not keep GPU dependent addresses
In reply to Nirmoy DasGPU address handling is device specific and should be handle by its device driver.
--- drivers/gpu/drm/ttm/ttm_bo.c | 7 ------- include/drm/ttm/ttm_bo_api.h | 2 -- include/drm/ttm/ttm_bo_driver.h | 1 - 3 files changed, 10 deletions(-)
drivers/gpu/drm/ttm/ttm_bo.c +0 -7
@@ -85,7 +85,6 @@ static void ttm_mem_type_debug(struct ttm_bo_device *bdev, struct drm_printer *pdrm_printf (p," has_type: %d\n" , man->has_type);drm_printf (p," use_type: %d\n" , man->use_type);drm_printf (p," flags: 0x%08X\n" , man->flags); -drm_printf (p," gpu_offset: 0x%08llX\n" , man->gpu_offset);drm_printf (p," size: %llu\n" , man->size);drm_printf (p," available_caching: 0x%08X\n" , man->available_caching);drm_printf (p," default_caching: 0x%08X\n" , man->default_caching);
@@ -343,12 +342,6 @@ static int ttm_bo_handle_move_mem(struct ttm_buffer_object *bo, moved: bo->evicted = false; -if (bo->mem.mm_node) - bo->offset = (bo->mem.start <<PAGE_SHIFT ) + - bdev->man[bo->mem.mem_type].gpu_offset; -else - bo->offset =0 ; - ctx->bytes_moved += bo->num_pages <<PAGE_SHIFT ;return 0 ;
include/drm/ttm/ttm_bo_api.h +0 -2
@@ -213,8 +213,6 @@ struct ttm_buffer_object {* either of these locks held. */ -uint64_t offset;/* GPU address space is independent of CPU word size */ -struct sg_table *sg; };
include/drm/ttm/ttm_bo_driver.h +0 -1
@@ -177,7 +177,6 @@ struct ttm_mem_type_manager {bool has_type;bool use_type;uint32_t flags; -uint64_t gpu_offset;/* GPU address space is independent of CPU word size */ uint64_t size;uint32_t available_caching;uint32_t default_caching;
Signature · 6 lines
2.27.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Christian König
maintainerI've pushed patches #1, #2 and #5-#8 of this series to drm-misc-next.
Only VMGFX and Nouveau are missing and I'm pretty close to just push them with my Acked-by since they should not contain any functional change.
Any objections?
Thanks,
Christian.
Am 24.06.20 um 20:26 schrieb Nirmoy Das:
Quoted 78 lines
With this patch series I am trying to remove GPU address dependency in TTM and moving GPU address calculation to individual drm drivers. This cleanup will simplify introduction of drm_mem_region/domain work started by Brian Welty[1].
It would be nice if someone test this for nouveau. Rest of the drivers are already tested.
v2:
* setbo->offset= 0 for drm/nouveau ifbo->mem.mm_node== NULLv3:
* catch return value ofdrm_gem_vram_offset()in drm/bochs
* introducedrm_gem_vram_pg_offset()in vram helper
* improvenbo->offsetcalculation for nouveauv4:
* minor coding style fixes in amdgpu and radeon
* remove unnecessary kerneldoc for internal functionv5:
* rebase on top of drm-misc-next
* fix return value ofdrm_gem_vram_pg_offset()
* add a comment indrm_gem_vram_pg_offset()to clearify why we return 0.v6:
* rebase to drm-misc-next
* removed acked for vmwgfx as there was a small conflictNirmoy Das (8):
drm/amdgpu: move ttm bo->offset to amdgpu_bo drm/radeon: don't use ttm bo->offset drm/vmwgfx: don't use ttm bo->offset drm/nouveau: don't use ttm bo->offset v3 drm/qxl: don't use ttm bo->offset drm/vram-helper: don't use ttm bo->offset v4 drm/bochs: use drm_gem_vram_offset to get bo offset v2 drm/ttm: do not keep GPU dependent addressesdrivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 23 ++++++++++++++-- drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 30 ++++++++++++++++----- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c | 4 +-- drivers/gpu/drm/bochs/bochs_kms.c | 7 ++++- drivers/gpu/drm/drm_gem_vram_helper.c | 11 +++++++- drivers/gpu/drm/nouveau/dispnv04/crtc.c | 6 ++--- drivers/gpu/drm/nouveau/dispnv04/disp.c | 3 ++- drivers/gpu/drm/nouveau/dispnv04/overlay.c | 6 ++--- drivers/gpu/drm/nouveau/dispnv50/base507c.c | 2 +- drivers/gpu/drm/nouveau/dispnv50/core507d.c | 2 +- drivers/gpu/drm/nouveau/dispnv50/ovly507e.c | 2 +- drivers/gpu/drm/nouveau/dispnv50/wndw.c | 2 +- drivers/gpu/drm/nouveau/dispnv50/wndwc37e.c | 2 +- drivers/gpu/drm/nouveau/nouveau_abi16.c | 8 +++--- drivers/gpu/drm/nouveau/nouveau_bo.c | 8 ++++++ drivers/gpu/drm/nouveau/nouveau_bo.h | 3 +++ drivers/gpu/drm/nouveau/nouveau_chan.c | 2 +- drivers/gpu/drm/nouveau/nouveau_dmem.c | 2 +- drivers/gpu/drm/nouveau/nouveau_fbcon.c | 2 +- drivers/gpu/drm/nouveau/nouveau_gem.c | 10 +++---- drivers/gpu/drm/qxl/qxl_drv.h | 6 ++--- drivers/gpu/drm/qxl/qxl_kms.c | 5 ++-- drivers/gpu/drm/qxl/qxl_object.h | 5 ---- drivers/gpu/drm/qxl/qxl_ttm.c | 9 ------- drivers/gpu/drm/radeon/radeon.h | 1 + drivers/gpu/drm/radeon/radeon_object.h | 16 ++++++++++- drivers/gpu/drm/radeon/radeon_ttm.c | 4 +-- drivers/gpu/drm/ttm/ttm_bo.c | 7 ----- drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 4 +-- drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 2 -- include/drm/ttm/ttm_bo_api.h | 2 -- include/drm/ttm/ttm_bo_driver.h | 1 - 36 files changed, 125 insertions(+), 78 deletions(-)
Quoted 3 lines
--
2.27.0
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 7 lines · Christian König
I've pushed patches #1, #2 and #5-#8 of this series to drm-misc-next.
Only VMGFX and Nouveau are missing and I'm pretty close to just push them with my Acked-by since they should not contain any functional change.
Any objections?
Sounds good to me, I just suggested to Alex on irc you do just that. These patches have been floating for long enough that there's stalling for driver maintainers is imo not needed for longer. -Daniel
Quoted 87 lines
Thanks,
Christian.Am 24.06.20 um 20:26 schrieb Nirmoy Das:
Quoted 81 lines
With this patch series I am trying to remove GPU address dependency in TTM and moving GPU address calculation to individual drm drivers. This cleanup will simplify introduction of drm_mem_region/domain work started by Brian Welty[1].
It would be nice if someone test this for nouveau. Rest of the drivers are already tested.
v2:
* setbo->offset= 0 for drm/nouveau ifbo->mem.mm_node== NULLv3:
* catch return value ofdrm_gem_vram_offset()in drm/bochs
* introducedrm_gem_vram_pg_offset()in vram helper
* improvenbo->offsetcalculation for nouveauv4:
* minor coding style fixes in amdgpu and radeon
* remove unnecessary kerneldoc for internal functionv5:
* rebase on top of drm-misc-next
* fix return value ofdrm_gem_vram_pg_offset()
* add a comment indrm_gem_vram_pg_offset()to clearify why we return 0.v6:
* rebase to drm-misc-next
* removed acked for vmwgfx as there was a small conflictNirmoy Das (8):
drm/amdgpu: move ttm bo->offset to amdgpu_bo drm/radeon: don't use ttm bo->offset drm/vmwgfx: don't use ttm bo->offset drm/nouveau: don't use ttm bo->offset v3 drm/qxl: don't use ttm bo->offset drm/vram-helper: don't use ttm bo->offset v4 drm/bochs: use drm_gem_vram_offset to get bo offset v2 drm/ttm: do not keep GPU dependent addressesdrivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 23 ++++++++++++++-- drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 30 ++++++++++++++++----- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c | 4 +-- drivers/gpu/drm/bochs/bochs_kms.c | 7 ++++- drivers/gpu/drm/drm_gem_vram_helper.c | 11 +++++++- drivers/gpu/drm/nouveau/dispnv04/crtc.c | 6 ++--- drivers/gpu/drm/nouveau/dispnv04/disp.c | 3 ++- drivers/gpu/drm/nouveau/dispnv04/overlay.c | 6 ++--- drivers/gpu/drm/nouveau/dispnv50/base507c.c | 2 +- drivers/gpu/drm/nouveau/dispnv50/core507d.c | 2 +- drivers/gpu/drm/nouveau/dispnv50/ovly507e.c | 2 +- drivers/gpu/drm/nouveau/dispnv50/wndw.c | 2 +- drivers/gpu/drm/nouveau/dispnv50/wndwc37e.c | 2 +- drivers/gpu/drm/nouveau/nouveau_abi16.c | 8 +++--- drivers/gpu/drm/nouveau/nouveau_bo.c | 8 ++++++ drivers/gpu/drm/nouveau/nouveau_bo.h | 3 +++ drivers/gpu/drm/nouveau/nouveau_chan.c | 2 +- drivers/gpu/drm/nouveau/nouveau_dmem.c | 2 +- drivers/gpu/drm/nouveau/nouveau_fbcon.c | 2 +- drivers/gpu/drm/nouveau/nouveau_gem.c | 10 +++---- drivers/gpu/drm/qxl/qxl_drv.h | 6 ++--- drivers/gpu/drm/qxl/qxl_kms.c | 5 ++-- drivers/gpu/drm/qxl/qxl_object.h | 5 ---- drivers/gpu/drm/qxl/qxl_ttm.c | 9 ------- drivers/gpu/drm/radeon/radeon.h | 1 + drivers/gpu/drm/radeon/radeon_object.h | 16 ++++++++++- drivers/gpu/drm/radeon/radeon_ttm.c | 4 +-- drivers/gpu/drm/ttm/ttm_bo.c | 7 ----- drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 4 +-- drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 2 -- include/drm/ttm/ttm_bo_api.h | 2 -- include/drm/ttm/ttm_bo_driver.h | 1 - 36 files changed, 125 insertions(+), 78 deletions(-)--
2.27.0
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 2 lines · Christian König
I've pushed patches #1, #2 and #5-#8 of this series to drm-misc-next.
I think you left an unresolved conflict behind in drm-tip, please resolve per
The script should have told you that already, so maybe reinvent that in whatever thing you're using :-) Jani has reported this on #dri-devel, this also holds up CI testing since we're running on top of drm-tip.
-Daniel
Quoted 91 lines
Only VMGFX and Nouveau are missing and I'm pretty close to just push them with my Acked-by since they should not contain any functional change.
Any objections?
Thanks,
Christian.Am 24.06.20 um 20:26 schrieb Nirmoy Das:
Quoted 81 lines
With this patch series I am trying to remove GPU address dependency in TTM and moving GPU address calculation to individual drm drivers. This cleanup will simplify introduction of drm_mem_region/domain work started by Brian Welty[1].
It would be nice if someone test this for nouveau. Rest of the drivers are already tested.
v2:
* setbo->offset= 0 for drm/nouveau ifbo->mem.mm_node== NULLv3:
* catch return value ofdrm_gem_vram_offset()in drm/bochs
* introducedrm_gem_vram_pg_offset()in vram helper
* improvenbo->offsetcalculation for nouveauv4:
* minor coding style fixes in amdgpu and radeon
* remove unnecessary kerneldoc for internal functionv5:
* rebase on top of drm-misc-next
* fix return value ofdrm_gem_vram_pg_offset()
* add a comment indrm_gem_vram_pg_offset()to clearify why we return 0.v6:
* rebase to drm-misc-next
* removed acked for vmwgfx as there was a small conflictNirmoy Das (8):
drm/amdgpu: move ttm bo->offset to amdgpu_bo drm/radeon: don't use ttm bo->offset drm/vmwgfx: don't use ttm bo->offset drm/nouveau: don't use ttm bo->offset v3 drm/qxl: don't use ttm bo->offset drm/vram-helper: don't use ttm bo->offset v4 drm/bochs: use drm_gem_vram_offset to get bo offset v2 drm/ttm: do not keep GPU dependent addressesdrivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 23 ++++++++++++++-- drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 30 ++++++++++++++++----- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c | 4 +-- drivers/gpu/drm/bochs/bochs_kms.c | 7 ++++- drivers/gpu/drm/drm_gem_vram_helper.c | 11 +++++++- drivers/gpu/drm/nouveau/dispnv04/crtc.c | 6 ++--- drivers/gpu/drm/nouveau/dispnv04/disp.c | 3 ++- drivers/gpu/drm/nouveau/dispnv04/overlay.c | 6 ++--- drivers/gpu/drm/nouveau/dispnv50/base507c.c | 2 +- drivers/gpu/drm/nouveau/dispnv50/core507d.c | 2 +- drivers/gpu/drm/nouveau/dispnv50/ovly507e.c | 2 +- drivers/gpu/drm/nouveau/dispnv50/wndw.c | 2 +- drivers/gpu/drm/nouveau/dispnv50/wndwc37e.c | 2 +- drivers/gpu/drm/nouveau/nouveau_abi16.c | 8 +++--- drivers/gpu/drm/nouveau/nouveau_bo.c | 8 ++++++ drivers/gpu/drm/nouveau/nouveau_bo.h | 3 +++ drivers/gpu/drm/nouveau/nouveau_chan.c | 2 +- drivers/gpu/drm/nouveau/nouveau_dmem.c | 2 +- drivers/gpu/drm/nouveau/nouveau_fbcon.c | 2 +- drivers/gpu/drm/nouveau/nouveau_gem.c | 10 +++---- drivers/gpu/drm/qxl/qxl_drv.h | 6 ++--- drivers/gpu/drm/qxl/qxl_kms.c | 5 ++-- drivers/gpu/drm/qxl/qxl_object.h | 5 ---- drivers/gpu/drm/qxl/qxl_ttm.c | 9 ------- drivers/gpu/drm/radeon/radeon.h | 1 + drivers/gpu/drm/radeon/radeon_object.h | 16 ++++++++++- drivers/gpu/drm/radeon/radeon_ttm.c | 4 +-- drivers/gpu/drm/ttm/ttm_bo.c | 7 ----- drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 4 +-- drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 2 -- include/drm/ttm/ttm_bo_api.h | 2 -- include/drm/ttm/ttm_bo_driver.h | 1 - 36 files changed, 125 insertions(+), 78 deletions(-)--
2.27.0
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Christian König
maintainerAm 25.06.20 um 17:44 schrieb Daniel Vetter:
Quoted 11 lines
Quoted 1 line · Christian König
I've pushed patches #1, #2 and #5-#8 of this series to drm-misc-next.
I think you left an unresolved conflict behind in drm-tip, please resolve per
The script should have told you that already, so maybe reinvent that in whatever thing you're using :-) Jani has reported this on #dri-devel, this also holds up CI testing since we're running on top of drm-tip.
Well I used dim push-branch. I even had to rebase once more because I forgot a signed-of on one of the patches, so I'm pretty sure of that.
Haven't seen anything problematic except for that while doing so.
Regards,
Christian.
Quoted 95 lines
-Daniel
Quoted 90 lines
Only VMGFX and Nouveau are missing and I'm pretty close to just push them with my Acked-by since they should not contain any functional change.
Any objections?
Thanks,
Christian.Am 24.06.20 um 20:26 schrieb Nirmoy Das:
Quoted 81 lines
With this patch series I am trying to remove GPU address dependency in TTM and moving GPU address calculation to individual drm drivers. This cleanup will simplify introduction of drm_mem_region/domain work started by Brian Welty[1].
It would be nice if someone test this for nouveau. Rest of the drivers are already tested.
v2:
* setbo->offset= 0 for drm/nouveau ifbo->mem.mm_node== NULLv3:
* catch return value ofdrm_gem_vram_offset()in drm/bochs
* introducedrm_gem_vram_pg_offset()in vram helper
* improvenbo->offsetcalculation for nouveauv4:
* minor coding style fixes in amdgpu and radeon
* remove unnecessary kerneldoc for internal functionv5:
* rebase on top of drm-misc-next
* fix return value ofdrm_gem_vram_pg_offset()
* add a comment indrm_gem_vram_pg_offset()to clearify why we return 0.v6:
* rebase to drm-misc-next
* removed acked for vmwgfx as there was a small conflictNirmoy Das (8):
drm/amdgpu: move ttm bo->offset to amdgpu_bo drm/radeon: don't use ttm bo->offset drm/vmwgfx: don't use ttm bo->offset drm/nouveau: don't use ttm bo->offset v3 drm/qxl: don't use ttm bo->offset drm/vram-helper: don't use ttm bo->offset v4 drm/bochs: use drm_gem_vram_offset to get bo offset v2 drm/ttm: do not keep GPU dependent addressesdrivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 23 ++++++++++++++-- drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 30 ++++++++++++++++----- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c | 4 +-- drivers/gpu/drm/bochs/bochs_kms.c | 7 ++++- drivers/gpu/drm/drm_gem_vram_helper.c | 11 +++++++- drivers/gpu/drm/nouveau/dispnv04/crtc.c | 6 ++--- drivers/gpu/drm/nouveau/dispnv04/disp.c | 3 ++- drivers/gpu/drm/nouveau/dispnv04/overlay.c | 6 ++--- drivers/gpu/drm/nouveau/dispnv50/base507c.c | 2 +- drivers/gpu/drm/nouveau/dispnv50/core507d.c | 2 +- drivers/gpu/drm/nouveau/dispnv50/ovly507e.c | 2 +- drivers/gpu/drm/nouveau/dispnv50/wndw.c | 2 +- drivers/gpu/drm/nouveau/dispnv50/wndwc37e.c | 2 +- drivers/gpu/drm/nouveau/nouveau_abi16.c | 8 +++--- drivers/gpu/drm/nouveau/nouveau_bo.c | 8 ++++++ drivers/gpu/drm/nouveau/nouveau_bo.h | 3 +++ drivers/gpu/drm/nouveau/nouveau_chan.c | 2 +- drivers/gpu/drm/nouveau/nouveau_dmem.c | 2 +- drivers/gpu/drm/nouveau/nouveau_fbcon.c | 2 +- drivers/gpu/drm/nouveau/nouveau_gem.c | 10 +++---- drivers/gpu/drm/qxl/qxl_drv.h | 6 ++--- drivers/gpu/drm/qxl/qxl_kms.c | 5 ++-- drivers/gpu/drm/qxl/qxl_object.h | 5 ---- drivers/gpu/drm/qxl/qxl_ttm.c | 9 ------- drivers/gpu/drm/radeon/radeon.h | 1 + drivers/gpu/drm/radeon/radeon_object.h | 16 ++++++++++- drivers/gpu/drm/radeon/radeon_ttm.c | 4 +-- drivers/gpu/drm/ttm/ttm_bo.c | 7 ----- drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 4 +-- drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 2 -- include/drm/ttm/ttm_bo_api.h | 2 -- include/drm/ttm/ttm_bo_driver.h | 1 - 36 files changed, 125 insertions(+), 78 deletions(-)--
2.27.0
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Christian König
maintainerAm 25.06.20 um 17:52 schrieb Christian König:
Quoted 9 lines
Am 25.06.20 um 17:44 schrieb Daniel Vetter:
Quoted 8 lines
Quoted 1 line · Christian König
I've pushed patches #1, #2 and #5-#8 of this series to drm-misc-next.
I think you left an unresolved conflict behind in drm-tip, please resolve per
Quoted 8 lines
Quoted 4 lines
The script should have told you that already, so maybe reinvent that in whatever thing you're using :-) Jani has reported this on #dri-devel, this also holds up CI testing since we're running on top of drm-tip.
Well I used dim push-branch. I even had to rebase once more because I forgot a signed-of on one of the patches, so I'm pretty sure of that.
Haven't seen anything problematic except for that while doing so.
Ok, anyway that one was trivial to fix.
Thanks,
Christian.
Quoted 101 lines
Regards,
Christian.Quoted 96 lines
-Daniel
Quoted 91 lines
Only VMGFX and Nouveau are missing and I'm pretty close to just push them with my Acked-by since they should not contain any functional change.
Any objections?
Thanks,
Christian.Am 24.06.20 um 20:26 schrieb Nirmoy Das:
Quoted 82 lines
With this patch series I am trying to remove GPU address dependency in TTM and moving GPU address calculation to individual drm drivers. This cleanup will simplify introduction of drm_mem_region/domain work started by Brian Welty[1].
It would be nice if someone test this for nouveau. Rest of the drivers are already tested.
v2:
* setbo->offset= 0 for drm/nouveau ifbo->mem.mm_node== NULLv3:
* catch return value ofdrm_gem_vram_offset()in drm/bochs
* introducedrm_gem_vram_pg_offset()in vram helper
* improvenbo->offsetcalculation for nouveauv4:
* minor coding style fixes in amdgpu and radeon
* remove unnecessary kerneldoc for internal functionv5:
* rebase on top of drm-misc-next
* fix return value ofdrm_gem_vram_pg_offset()
* add a comment indrm_gem_vram_pg_offset()to clearify why we return 0.v6:
* rebase to drm-misc-next
* removed acked for vmwgfx as there was a small conflictNirmoy Das (8):
drm/amdgpu: move ttmbo->offsettoamdgpu_bodrm/radeon: don't use ttmbo->offsetdrm/vmwgfx: don't use ttmbo->offsetdrm/nouveau: don't use ttmbo->offsetv3 drm/qxl: don't use ttmbo->offsetdrm/vram-helper: don't use ttmbo->offsetv4 drm/bochs: usedrm_gem_vram_offsetto get bo offset v2 drm/ttm: do not keep GPU dependent addressesdrivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 23 ++++++++++++++-- drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 30
++++++++++++++++-----
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 1 +drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c| 4 +-- drivers/gpu/drm/bochs/bochs_kms.c | 7 ++++- drivers/gpu/drm/drm_gem_vram_helper.c | 11 +++++++- drivers/gpu/drm/nouveau/dispnv04/crtc.c | 6 ++--- drivers/gpu/drm/nouveau/dispnv04/disp.c | 3 ++- drivers/gpu/drm/nouveau/dispnv04/overlay.c | 6 ++---drivers/gpu/drm/nouveau/dispnv50/base507c.c | 2 +- drivers/gpu/drm/nouveau/dispnv50/core507d.c | 2 +- drivers/gpu/drm/nouveau/dispnv50/ovly507e.c | 2 +-drivers/gpu/drm/nouveau/dispnv50/wndw.c | 2 +-
drivers/gpu/drm/nouveau/dispnv50/wndwc37e.c| 2 +- drivers/gpu/drm/nouveau/nouveau_abi16.c | 8 +++--- drivers/gpu/drm/nouveau/nouveau_bo.c | 8 ++++++ drivers/gpu/drm/nouveau/nouveau_bo.h | 3 +++ drivers/gpu/drm/nouveau/nouveau_chan.c | 2 +- drivers/gpu/drm/nouveau/nouveau_dmem.c | 2 +- drivers/gpu/drm/nouveau/nouveau_fbcon.c | 2 +- drivers/gpu/drm/nouveau/nouveau_gem.c | 10 +++---- drivers/gpu/drm/qxl/qxl_drv.h | 6 ++--- drivers/gpu/drm/qxl/qxl_kms.c | 5 ++-- drivers/gpu/drm/qxl/qxl_object.h | 5 ---- drivers/gpu/drm/qxl/qxl_ttm.c | 9 ------- drivers/gpu/drm/radeon/radeon.h | 1 + drivers/gpu/drm/radeon/radeon_object.h | 16 ++++++++++- drivers/gpu/drm/radeon/radeon_ttm.c | 4 +-- drivers/gpu/drm/ttm/ttm_bo.c | 7 ----- drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 4 +-- drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 2 -- include/drm/ttm/ttm_bo_api.h | 2 -- include/drm/ttm/ttm_bo_driver.h | 1 -36 files changed, 125 insertions(+), 78 deletions(-)Signature · 1 line
2.27.0
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Christian König
maintainerAm 25.06.20 um 18:02 schrieb Christian König:
Quoted 15 lines
Am 25.06.20 um 17:52 schrieb Christian König:
Quoted 14 lines
Am 25.06.20 um 17:44 schrieb Daniel Vetter:
Quoted 12 lines
Quoted 1 line · Christian König
I've pushed patches #1, #2 and #5-#8 of this series to drm-misc-next.
I think you left an unresolved conflict behind in drm-tip, please resolve per
The script should have told you that already, so maybe reinvent that in whatever thing you're using :-) Jani has reported this on #dri-devel, this also holds up CI testing since we're running on top of drm-tip.
Quoted 5 lines
Quoted 3 lines
Well I used dim push-branch. I even had to rebase once more because I forgot a signed-of on one of the patches, so I'm pretty sure of that.
Haven't seen anything problematic except for that while doing so.
Ok, anyway that one was trivial to fix.
Ran into the next merge conflict. But no surprise that I missed the warning, that needs to be in red or so.
Regards,
Christian.
Quoted 106 lines
Thanks,
Christian.Quoted 101 lines
Regards,
Christian.Quoted 96 lines
-Daniel
Quoted 91 lines
Only VMGFX and Nouveau are missing and I'm pretty close to just push them with my Acked-by since they should not contain any functional change.
Any objections?
Thanks,
Christian.Am 24.06.20 um 20:26 schrieb Nirmoy Das:
Quoted 82 lines
With this patch series I am trying to remove GPU address dependency in TTM and moving GPU address calculation to individual drm drivers. This cleanup will simplify introduction of drm_mem_region/domain work started by Brian Welty[1].
It would be nice if someone test this for nouveau. Rest of the drivers are already tested.
v2:
* setbo->offset= 0 for drm/nouveau ifbo->mem.mm_node== NULLv3:
* catch return value ofdrm_gem_vram_offset()in drm/bochs
* introducedrm_gem_vram_pg_offset()in vram helper
* improvenbo->offsetcalculation for nouveauv4:
* minor coding style fixes in amdgpu and radeon
* remove unnecessary kerneldoc for internal functionv5:
* rebase on top of drm-misc-next
* fix return value ofdrm_gem_vram_pg_offset()
* add a comment indrm_gem_vram_pg_offset()to clearify why we return 0.v6:
* rebase to drm-misc-next
* removed acked for vmwgfx as there was a small conflictNirmoy Das (8):
drm/amdgpu: move ttmbo->offsettoamdgpu_bodrm/radeon: don't use ttmbo->offsetdrm/vmwgfx: don't use ttmbo->offsetdrm/nouveau: don't use ttmbo->offsetv3 drm/qxl: don't use ttmbo->offsetdrm/vram-helper: don't use ttmbo->offsetv4 drm/bochs: usedrm_gem_vram_offsetto get bo offset v2 drm/ttm: do not keep GPU dependent addressesdrivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 23 ++++++++++++++-- drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 30
++++++++++++++++-----
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 1 +drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c| 4 +-- drivers/gpu/drm/bochs/bochs_kms.c | 7 ++++- drivers/gpu/drm/drm_gem_vram_helper.c | 11 +++++++- drivers/gpu/drm/nouveau/dispnv04/crtc.c | 6 ++--- drivers/gpu/drm/nouveau/dispnv04/disp.c | 3 ++- drivers/gpu/drm/nouveau/dispnv04/overlay.c | 6 ++---drivers/gpu/drm/nouveau/dispnv50/base507c.c | 2 +- drivers/gpu/drm/nouveau/dispnv50/core507d.c | 2 +- drivers/gpu/drm/nouveau/dispnv50/ovly507e.c | 2 +-drivers/gpu/drm/nouveau/dispnv50/wndw.c | 2 +-
drivers/gpu/drm/nouveau/dispnv50/wndwc37e.c| 2 +- drivers/gpu/drm/nouveau/nouveau_abi16.c | 8 +++--- drivers/gpu/drm/nouveau/nouveau_bo.c | 8 ++++++ drivers/gpu/drm/nouveau/nouveau_bo.h | 3 +++ drivers/gpu/drm/nouveau/nouveau_chan.c | 2 +- drivers/gpu/drm/nouveau/nouveau_dmem.c | 2 +- drivers/gpu/drm/nouveau/nouveau_fbcon.c | 2 +- drivers/gpu/drm/nouveau/nouveau_gem.c | 10 +++---- drivers/gpu/drm/qxl/qxl_drv.h | 6 ++--- drivers/gpu/drm/qxl/qxl_kms.c | 5 ++-- drivers/gpu/drm/qxl/qxl_object.h | 5 ---- drivers/gpu/drm/qxl/qxl_ttm.c | 9 ------- drivers/gpu/drm/radeon/radeon.h | 1 + drivers/gpu/drm/radeon/radeon_object.h | 16 ++++++++++- drivers/gpu/drm/radeon/radeon_ttm.c | 4 +-- drivers/gpu/drm/ttm/ttm_bo.c | 7 ----- drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 4 +-- drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 2 -- include/drm/ttm/ttm_bo_api.h | 2 -- include/drm/ttm/ttm_bo_driver.h | 1 -36 files changed, 125 insertions(+), 78 deletions(-)Signature · 1 line
2.27.0
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 21 lines · Christian König
Am 25.06.20 um 18:02 schrieb Christian König:
Quoted 19 lines
Am 25.06.20 um 17:52 schrieb Christian König:
Quoted 18 lines
Am 25.06.20 um 17:44 schrieb Daniel Vetter:
Quoted 6 lines
Quoted 1 line · Christian König
I've pushed patches #1, #2 and #5-#8 of this series to drm-misc-next.
I think you left an unresolved conflict behind in drm-tip, please resolve per
Quoted 7 lines
The script should have told you that already, so maybe reinvent that in whatever thing you're using :-) Jani has reported this on #dri-devel, this also holds up CI testing since we're running on top of drm-tip.
Well I used dim push-branch. I even had to rebase once more because I forgot a signed-of on one of the patches, so I'm pretty sure of that.
Quoted 6 lines
Quoted 3 lines
Quoted 1 line
Haven't seen anything problematic except for that while doing so.
Ok, anyway that one was trivial to fix.
Ran into the next merge conflict. But no surprise that I missed the warning, that needs to be in red or so.
Yeah the trouble is that the merging is done after you pushed, we don't do a test drm-tip rebuild before you push. Reason is that I've not gotten around to implementing this since years, it's on the wishlist.
If we'd do a test-rebuild before pushing (something like use all the normal branches, excpet for $branch use the local one, or a specific sha1, with git worktree that's all shared so doable), then it would be a lot more obvious that people have some work to do before they're done with their push.
Trouble is only rebuilding in dim push isn't enough, since then you can't test. So we need the full suite of tools be able to work with a local branch. And once you have a conflict which needs a fixup patch that's kinda not possible anymore.
But maybe just doing the test-rebuild and if that fails, pointing it out and requiring a special --promises-I-fix-it-up-right-afterwards flag might be good enough.
If you know how to print stuff in red if it's a terminal, then patching warn_or_fail should catch them all.
-Daniel
Quoted 117 lines
Regards,
Christian.Quoted 112 lines
Thanks,
Christian.Quoted 107 lines
Regards,
Christian.Quoted 102 lines
-Daniel
Quoted 97 lines
Only VMGFX and Nouveau are missing and I'm pretty close to just push them with my Acked-by since they should not contain any functional change.
Any objections?
Thanks,
Christian.Am 24.06.20 um 20:26 schrieb Nirmoy Das:
Quoted 87 lines
With this patch series I am trying to remove GPU address dependency in
TTM and moving GPU address calculation to individual drm drivers. This
cleanup will simplify introduction of drm_mem_region/domain work started
by Brian Welty[1].It would be nice if someone test this for nouveau. Rest of the drivers
are already tested.v2:
* setbo->offset= 0 for drm/nouveau ifbo->mem.mm_node== NULLv3:
* catch return value ofdrm_gem_vram_offset()in drm/bochs
* introducedrm_gem_vram_pg_offset()in vram helper
* improvenbo->offsetcalculation for nouveauv4:
* minor coding style fixes in amdgpu and radeon
* remove unnecessary kerneldoc for internal functionv5:
* rebase on top of drm-misc-next
* fix return value ofdrm_gem_vram_pg_offset()
* add a comment indrm_gem_vram_pg_offset()to clearify why we return 0.v6:
* rebase to drm-misc-next
* removed acked for vmwgfx as there was a small conflictNirmoy Das (8):
drm/amdgpu: move ttm bo->offset to amdgpu_bo drm/radeon: don't use ttm bo->offset drm/vmwgfx: don't use ttm bo->offset drm/nouveau: don't use ttm bo->offset v3 drm/qxl: don't use ttm bo->offset drm/vram-helper: don't use ttm bo->offset v4 drm/bochs: use drm_gem_vram_offset to get bo offset v2 drm/ttm: do not keep GPU dependent addressesdrivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 23 ++++++++++++++-- drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 30 ++++++++++++++++----- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c | 4 +-- drivers/gpu/drm/bochs/bochs_kms.c | 7 ++++- drivers/gpu/drm/drm_gem_vram_helper.c | 11 +++++++- drivers/gpu/drm/nouveau/dispnv04/crtc.c | 6 ++--- drivers/gpu/drm/nouveau/dispnv04/disp.c | 3 ++- drivers/gpu/drm/nouveau/dispnv04/overlay.c | 6 ++--- drivers/gpu/drm/nouveau/dispnv50/base507c.c | 2 +- drivers/gpu/drm/nouveau/dispnv50/core507d.c | 2 +- drivers/gpu/drm/nouveau/dispnv50/ovly507e.c | 2 +- drivers/gpu/drm/nouveau/dispnv50/wndw.c | 2 +- drivers/gpu/drm/nouveau/dispnv50/wndwc37e.c | 2 +- drivers/gpu/drm/nouveau/nouveau_abi16.c | 8 +++--- drivers/gpu/drm/nouveau/nouveau_bo.c | 8 ++++++ drivers/gpu/drm/nouveau/nouveau_bo.h | 3 +++ drivers/gpu/drm/nouveau/nouveau_chan.c | 2 +- drivers/gpu/drm/nouveau/nouveau_dmem.c | 2 +- drivers/gpu/drm/nouveau/nouveau_fbcon.c | 2 +- drivers/gpu/drm/nouveau/nouveau_gem.c | 10 +++---- drivers/gpu/drm/qxl/qxl_drv.h | 6 ++--- drivers/gpu/drm/qxl/qxl_kms.c | 5 ++-- drivers/gpu/drm/qxl/qxl_object.h | 5 ---- drivers/gpu/drm/qxl/qxl_ttm.c | 9 ------- drivers/gpu/drm/radeon/radeon.h | 1 + drivers/gpu/drm/radeon/radeon_object.h | 16 ++++++++++- drivers/gpu/drm/radeon/radeon_ttm.c | 4 +-- drivers/gpu/drm/ttm/ttm_bo.c | 7 ----- drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 4 +-- drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 2 -- include/drm/ttm/ttm_bo_api.h | 2 -- include/drm/ttm/ttm_bo_driver.h | 1 - 36 files changed, 125 insertions(+), 78 deletions(-)--
2.27.0
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 47 lines · Daniel Vetter
Quoted 21 lines · Christian König
Am 25.06.20 um 18:02 schrieb Christian König:
Quoted 19 lines
Am 25.06.20 um 17:52 schrieb Christian König:
Quoted 18 lines
Am 25.06.20 um 17:44 schrieb Daniel Vetter:
Quoted 6 lines
Quoted 1 line · Christian König
I've pushed patches #1, #2 and #5-#8 of this series to drm-misc-next.
I think you left an unresolved conflict behind in drm-tip, please resolve per
Quoted 7 lines
The script should have told you that already, so maybe reinvent that in whatever thing you're using :-) Jani has reported this on #dri-devel, this also holds up CI testing since we're running on top of drm-tip.
Well I used dim push-branch. I even had to rebase once more because I forgot a signed-of on one of the patches, so I'm pretty sure of that.
Quoted 6 lines
Quoted 3 lines
Quoted 1 line
Haven't seen anything problematic except for that while doing so.
Ok, anyway that one was trivial to fix.
Ran into the next merge conflict. But no surprise that I missed the warning, that needs to be in red or so.
Yeah the trouble is that the merging is done after you pushed, we don't do a test drm-tip rebuild before you push. Reason is that I've not gotten around to implementing this since years, it's on the wishlist.
If we'd do a test-rebuild before pushing (something like use all the normal branches, excpet for $branch use the local one, or a specific sha1, with git worktree that's all shared so doable), then it would be a lot more obvious that people have some work to do before they're done with their push.
Trouble is only rebuilding in dim push isn't enough, since then you can't test. So we need the full suite of tools be able to work with a local branch. And once you have a conflict which needs a fixup patch that's kinda not possible anymore.
Quoted 6 lines
But maybe just doing the test-rebuild and if that fails, pointing it out and requiring a special --promises-I-fix-it-up-right-afterwards flag might be good enough.
If you know how to print stuff in red if it's a terminal, then patching
warn_or_failshould catch them all.
Uh I mean patching echoerr.
-Daniel
Quoted 126 lines
-Daniel
Quoted 117 lines
Regards,
Christian.Quoted 112 lines
Thanks,
Christian.Quoted 107 lines
Regards,
Christian.Quoted 102 lines
-Daniel
Quoted 97 lines
Only VMGFX and Nouveau are missing and I'm pretty close to just push them with my Acked-by since they should not contain any functional change.
Any objections?
Thanks,
Christian.Am 24.06.20 um 20:26 schrieb Nirmoy Das:
Quoted 87 lines
With this patch series I am trying to remove GPU address dependency in
TTM and moving GPU address calculation to individual drm drivers. This
cleanup will simplify introduction of drm_mem_region/domain work started
by Brian Welty[1].It would be nice if someone test this for nouveau. Rest of the drivers
are already tested.v2:
* setbo->offset= 0 for drm/nouveau ifbo->mem.mm_node== NULLv3:
* catch return value ofdrm_gem_vram_offset()in drm/bochs
* introducedrm_gem_vram_pg_offset()in vram helper
* improvenbo->offsetcalculation for nouveauv4:
* minor coding style fixes in amdgpu and radeon
* remove unnecessary kerneldoc for internal functionv5:
* rebase on top of drm-misc-next
* fix return value ofdrm_gem_vram_pg_offset()
* add a comment indrm_gem_vram_pg_offset()to clearify why we return 0.v6:
* rebase to drm-misc-next
* removed acked for vmwgfx as there was a small conflictNirmoy Das (8):
drm/amdgpu: move ttm bo->offset to amdgpu_bo drm/radeon: don't use ttm bo->offset drm/vmwgfx: don't use ttm bo->offset drm/nouveau: don't use ttm bo->offset v3 drm/qxl: don't use ttm bo->offset drm/vram-helper: don't use ttm bo->offset v4 drm/bochs: use drm_gem_vram_offset to get bo offset v2 drm/ttm: do not keep GPU dependent addressesdrivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 23 ++++++++++++++-- drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 30 ++++++++++++++++----- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c | 4 +-- drivers/gpu/drm/bochs/bochs_kms.c | 7 ++++- drivers/gpu/drm/drm_gem_vram_helper.c | 11 +++++++- drivers/gpu/drm/nouveau/dispnv04/crtc.c | 6 ++--- drivers/gpu/drm/nouveau/dispnv04/disp.c | 3 ++- drivers/gpu/drm/nouveau/dispnv04/overlay.c | 6 ++--- drivers/gpu/drm/nouveau/dispnv50/base507c.c | 2 +- drivers/gpu/drm/nouveau/dispnv50/core507d.c | 2 +- drivers/gpu/drm/nouveau/dispnv50/ovly507e.c | 2 +- drivers/gpu/drm/nouveau/dispnv50/wndw.c | 2 +- drivers/gpu/drm/nouveau/dispnv50/wndwc37e.c | 2 +- drivers/gpu/drm/nouveau/nouveau_abi16.c | 8 +++--- drivers/gpu/drm/nouveau/nouveau_bo.c | 8 ++++++ drivers/gpu/drm/nouveau/nouveau_bo.h | 3 +++ drivers/gpu/drm/nouveau/nouveau_chan.c | 2 +- drivers/gpu/drm/nouveau/nouveau_dmem.c | 2 +- drivers/gpu/drm/nouveau/nouveau_fbcon.c | 2 +- drivers/gpu/drm/nouveau/nouveau_gem.c | 10 +++---- drivers/gpu/drm/qxl/qxl_drv.h | 6 ++--- drivers/gpu/drm/qxl/qxl_kms.c | 5 ++-- drivers/gpu/drm/qxl/qxl_object.h | 5 ---- drivers/gpu/drm/qxl/qxl_ttm.c | 9 ------- drivers/gpu/drm/radeon/radeon.h | 1 + drivers/gpu/drm/radeon/radeon_object.h | 16 ++++++++++- drivers/gpu/drm/radeon/radeon_ttm.c | 4 +-- drivers/gpu/drm/ttm/ttm_bo.c | 7 ----- drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 4 +-- drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 2 -- include/drm/ttm/ttm_bo_api.h | 2 -- include/drm/ttm/ttm_bo_driver.h | 1 - 36 files changed, 125 insertions(+), 78 deletions(-)--
2.27.0--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel