dri-devel August 2019

dri-devel@lists.freedesktop.org

318 participants
2338 discussions

[PATCH v4 0/4] drm/bochs: some cleanups.
by Gerd Hoffmann 22 Aug '19

22 Aug '19

Gerd Hoffmann (4): drm/bochs: pass framebuffer to bochs_hw_setbase drm/bochs: drop yres_virtual from struct bochs_device drm/bochs: drop stride and bpp from struct bochs_device drm/bochs: move bochs_hw_setformat() call drivers/gpu/drm/bochs/bochs.h | 10 +++----- drivers/gpu/drm/bochs/bochs_hw.c | 41 +++++++++++++------------------ drivers/gpu/drm/bochs/bochs_kms.c | 14 +++-------- 3 files changed, 24 insertions(+), 41 deletions(-) -- 2.18.1

1 4

[PATCH 0/3] RFC/T: dma_resv vs. mmap_sem
by Daniel Vetter 22 Aug '19

22 Aug '19

Hi all, As part of all the recent discussions around ttm and dma_resv I started looking into this. The goal (at least somewhen in the near future) is to have it all documented and the cross-driver semantics locked down as much as possible. One of the biggest issues there is how the dma_resv ww_mutex fits into the overall locking hierarchy, especially wrt core mm locks. This patch series should fix that. Comments, review and especially testing (there's only so much you can do with auditing) very much appreciated. Cheers, Daniel Daniel Vetter (3): dma_resv: prime lockdep annotations drm/nouveau: slowpath for pushbuf ioctl drm/ttm: remove ttm_bo_wait_unreserved drivers/dma-buf/dma-resv.c | 12 ++++++ drivers/gpu/drm/nouveau/nouveau_gem.c | 57 ++++++++++++++++++--------- drivers/gpu/drm/ttm/ttm_bo.c | 34 ---------------- drivers/gpu/drm/ttm/ttm_bo_vm.c | 26 +----------- include/drm/ttm/ttm_bo_api.h | 1 - 5 files changed, 51 insertions(+), 79 deletions(-) -- 2.23.0.rc1

5 36

linux-next: manual merge of the drm-intel tree with the drm tree
by Stephen Rothwell 22 Aug '19

22 Aug '19

Hi all, Today's linux-next merge of the drm-intel tree got a conflict in: drivers/gpu/drm/i915/i915_vma.c between commit: 52791eeec1d9 ("dma-buf: rename reservation_object to dma_resv") from the drm tree and commit: cd2a4eaf8c79 ("drm/i915: Report resv_obj allocation failure") from the drm-intel tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/i915/i915_vma.c index 2645f4e850c2,252edef6c59e..000000000000 --- a/drivers/gpu/drm/i915/i915_vma.c +++ b/drivers/gpu/drm/i915/i915_vma.c @@@ -926,14 -906,22 +906,22 @@@ int i915_vma_move_to_active(struct i915 if (unlikely(err)) return err; - obj->write_domain = 0; if (flags & EXEC_OBJECT_WRITE) { - obj->write_domain = I915_GEM_DOMAIN_RENDER; - - if (intel_fb_obj_invalidate(obj, ORIGIN_CS)) - __i915_active_request_set(&obj->frontbuffer_write, rq); + if (intel_frontbuffer_invalidate(obj->frontbuffer, ORIGIN_CS)) + i915_active_ref(&obj->frontbuffer->write, + rq->timeline, + rq); - reservation_object_add_excl_fence(vma->resv, &rq->fence); ++ dma_resv_add_excl_fence(vma->resv, &rq->fence); + obj->write_domain = I915_GEM_DOMAIN_RENDER; obj->read_domains = 0; + } else { - err = reservation_object_reserve_shared(vma->resv, 1); ++ err = dma_resv_reserve_shared(vma->resv, 1); + if (unlikely(err)) + return err; + - reservation_object_add_shared_fence(vma->resv, &rq->fence); ++ dma_resv_add_shared_fence(vma->resv, &rq->fence); + obj->write_domain = 0; } obj->read_domains |= I915_GEM_GPU_DOMAINS; obj->mm.dirty = true;

1 0

[PATCH] drm/amdkfd: remove set but not used variable 'pdd'
by YueHaibing 22 Aug '19

22 Aug '19

Fixes gcc '-Wunused-but-set-variable' warning: drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_process.c: In function restore_process_worker: drivers/gpu/drm/amd/amdgpu/../amdkfd/kfd_process.c:949:29: warning: variable pdd set but not used [-Wunused-but-set-variable] It is not used since commit 5b87245faf57 ("drm/amdkfd: Simplify kfd2kgd interface") Reported-by: Hulk Robot <hulkci(a)huawei.com> Signed-off-by: YueHaibing <yuehaibing(a)huawei.com> --- drivers/gpu/drm/amd/amdkfd/kfd_process.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_process.c b/drivers/gpu/drm/amd/amdkfd/kfd_process.c index 8f1076c..240bf68 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_process.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_process.c @@ -1042,7 +1042,6 @@ static void restore_process_worker(struct work_struct *work) { struct delayed_work *dwork; struct kfd_process *p; - struct kfd_process_device *pdd; int ret = 0; dwork = to_delayed_work(work); @@ -1051,16 +1050,6 @@ static void restore_process_worker(struct work_struct *work) * lifetime of this thread, kfd_process p will be valid */ p = container_of(dwork, struct kfd_process, restore_work); - - /* Call restore_process_bos on the first KGD device. This function - * takes care of restoring the whole process including other devices. - * Restore can fail if enough memory is not available. If so, - * reschedule again. - */ - pdd = list_first_entry(&p->per_device_data, - struct kfd_process_device, - per_device_list); - pr_debug("Started restoring pasid %d\n", p->pasid); /* Setting last_restore_timestamp before successful restoration. -- 2.7.4

2 1

[PATCH] drm/amd/display: remove duplicated include from dc_link.c
by YueHaibing 22 Aug '19

22 Aug '19

Remove duplicated include. Reported-by: Hulk Robot <hulkci(a)huawei.com> Signed-off-by: YueHaibing <yuehaibing(a)huawei.com> --- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link.c b/drivers/gpu/drm/amd/display/dc/core/dc_link.c index 193d6f1..a14785d 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc_link.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_link.c @@ -45,10 +45,6 @@ #include "dpcd_defs.h" #include "dmcu.h" #include "hw/clk_mgr.h" -#if defined(CONFIG_DRM_AMD_DC_DCN2_0) -#include "resource.h" -#endif -#include "hw/clk_mgr.h" #define DC_LOGGER_INIT(logger) -- 2.7.4

2 1

[PATCH -next] drm/amdgpu: remove duplicated include from gfx_v9_0.c
by YueHaibing 22 Aug '19

22 Aug '19

Remove duplicated include. Signed-off-by: YueHaibing <yuehaibing(a)huawei.com> --- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c index 5ba332376710..822f45161240 100644 --- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c @@ -39,7 +39,6 @@ #include "vega10_enum.h" #include "hdp/hdp_4_0_offset.h" -#include "soc15.h" #include "soc15_common.h" #include "clearstate_gfx9.h" #include "v9_structs.h"

2 1

[PATCH -next] drm/amdgpu: remove set but not used variable 'psp_enabled'
by YueHaibing 22 Aug '19

22 Aug '19

Fixes gcc '-Wunused-but-set-variable' warning: drivers/gpu/drm/amd/amdgpu/nv.c: In function 'nv_common_early_init': drivers/gpu/drm/amd/amdgpu/nv.c:471:7: warning: variable 'psp_enabled' set but not used [-Wunused-but-set-variable] It's not used since inroduction in commit c6b6a42175f5 ("drm/amdgpu: add navi10 common ip block (v3)") Signed-off-by: YueHaibing <yuehaibing(a)huawei.com> --- drivers/gpu/drm/amd/amdgpu/nv.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/nv.c b/drivers/gpu/drm/amd/amdgpu/nv.c index af20ffb55c54..8b9fa3db8daa 100644 --- a/drivers/gpu/drm/amd/amdgpu/nv.c +++ b/drivers/gpu/drm/amd/amdgpu/nv.c @@ -468,7 +468,6 @@ static const struct amdgpu_asic_funcs nv_asic_funcs = static int nv_common_early_init(void *handle) { - bool psp_enabled = false; struct amdgpu_device *adev = (struct amdgpu_device *)handle; adev->smc_rreg = NULL; @@ -485,10 +484,6 @@ static int nv_common_early_init(void *handle) adev->asic_funcs = &nv_asic_funcs; - if (amdgpu_device_ip_get_ip_block(adev, AMD_IP_BLOCK_TYPE_PSP) && - (amdgpu_ip_block_mask & (1 << AMD_IP_BLOCK_TYPE_PSP))) - psp_enabled = true; - adev->rev_id = nv_get_rev_id(adev); adev->external_rev_id = 0xff; switch (adev->asic_type) {

2 1

[PATCH] drm/amd/display: Fix 32-bit divide error in wait_for_alt_mode
by Nathan Chancellor 22 Aug '19

22 Aug '19

When building arm32 allyesconfig: ld.lld: error: undefined symbol: __aeabi_uldivmod >>> referenced by dc_link.c >>> gpu/drm/amd/display/dc/core/dc_link.o:(wait_for_alt_mode) in archive drivers/built-in.a >>> referenced by dc_link.c >>> gpu/drm/amd/display/dc/core/dc_link.o:(wait_for_alt_mode) in archive drivers/built-in.a time_taken_in_ns is of type unsigned long long so we need to use div_u64 to avoid this error. Fixes: b5b1f4554904 ("drm/amd/display: Enable type C hotplug") Reported-by: Randy Dunlap <rdunlap(a)infradead.org> Signed-off-by: Nathan Chancellor <natechancellor(a)gmail.com> --- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link.c b/drivers/gpu/drm/amd/display/dc/core/dc_link.c index f2d78d7b089e..8634923b4444 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc_link.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_link.c @@ -721,7 +721,7 @@ bool wait_for_alt_mode(struct dc_link *link) time_taken_in_ns = dm_get_elapse_time_in_ns( link->ctx, finish_timestamp, enter_timestamp); DC_LOG_WARNING("Alt mode entered finished after %llu ms\n", - time_taken_in_ns / 1000000); + div_u64(time_taken_in_ns, 1000000)); return true; } @@ -730,7 +730,7 @@ bool wait_for_alt_mode(struct dc_link *link) time_taken_in_ns = dm_get_elapse_time_in_ns(link->ctx, finish_timestamp, enter_timestamp); DC_LOG_WARNING("Alt mode has timed out after %llu ms\n", - time_taken_in_ns / 1000000); + div_u64(time_taken_in_ns, 1000000)); return false; } -- 2.23.0

4 3

[pull] amdgpu drm-fixes-5.3
by Alex Deucher 22 Aug '19

22 Aug '19

Hi Dave, Daniel, A few fixes for 5.3. Nothing major. The following changes since commit 2f62c5d6ed0abae8e70bd83f4d41b9d63acde45a: Merge tag 'drm-fixes-5.3-2019-08-14' of git://people.freedesktop.org/~agd5f/linux into drm-fixes (2019-08-15 13:29:18 +1000) are available in the Git repository at: git://people.freedesktop.org/~agd5f/linux tags/drm-fixes-5.3-2019-08-21 for you to fetch changes up to ec6e491353b9024d4b1a65c48b21e3bc0faeae4e: drm/amd/display: Calculate bpc based on max_requested_bpc (2019-08-21 17:33:32 -0500) ---------------------------------------------------------------- drm-fixes-5.3-2019-08-21: amdgpu: - Fix gfxoff logic on RV - Powerplay fixes - Fix a possible memory leak in CS ioctl - bpc fix for display ---------------------------------------------------------------- Alex Deucher (1): drm/amdgpu/gfx9: update pg_flags after determining if gfx off is possible Kenneth Feng (1): drm/amd/amdgpu: disable MMHUB PG for navi10 Kevin Wang (2): drm/amd/powerplay: fix variable type errors in smu_v11_0_setup_pptable drm/amd/powerplay: remove duplicate macro smu_get_uclk_dpm_states in amdgpu_smu.h Nicholas Kazlauskas (1): drm/amd/display: Calculate bpc based on max_requested_bpc Nicolai Hähnle (1): drm/amdgpu: prevent memory leaks in AMDGPU_CS ioctl drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 9 +++++++-- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 4 ++++ drivers/gpu/drm/amd/amdgpu/nv.c | 1 - drivers/gpu/drm/amd/amdgpu/soc15.c | 5 ----- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 16 ++++++++++++++-- drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 2 -- drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 4 +++- 7 files changed, 28 insertions(+), 13 deletions(-)

1 0

linux-next: manual merge of the drm-misc tree with the drm and drm-intel trees
by Stephen Rothwell 21 Aug '19

21 Aug '19

Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/amd/amdgpu/amdgpu_object.c drivers/gpu/drm/i915/i915_vma.c drivers/gpu/drm/i915/i915_gem_batch_pool.c drivers/gpu/drm/i915/gem/i915_gem_object.c drivers/gpu/drm/i915/gt/intel_engine_pool.c between commits: a93615f900bd ("drm/i915: Throw away the active object retirement complexity") 12c255b5dad1 ("drm/i915: Provide an i915_active.acquire callback") cd2a4eaf8c79 ("drm/i915: Report resv_obj allocation failure") b40d73784ffc ("drm/i915: Replace struct_mutex for batch pool serialisation") ab2f7a5c18b5 ("drm/amdgpu: Implement VRAM wipe on release") 0c159ffef628 ("drm/i915/gem: Defer obj->base.resv fini until RCU callback") from the drm and drm-intel trees and commit: 52791eeec1d9 ("dma-buf: rename reservation_object to dma_resv") from the drm-misc tree. I fixed it up (see below and I added the following merge fix patch) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. From: Stephen Rothwell <sfr(a)canb.auug.org.au> Date: Wed, 14 Aug 2019 12:48:39 +1000 Subject: [PATCH] drm: fix up fallout from "dma-buf: rename reservation_object to dma_resv" Signed-off-by: Stephen Rothwell <sfr(a)canb.auug.org.au> --- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 4 ++-- drivers/gpu/drm/i915/gem/i915_gem_object.c | 2 +- drivers/gpu/drm/i915/gt/intel_engine_pool.c | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c index dfd4aa68c806..6ebe61e14f29 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c @@ -1242,7 +1242,7 @@ void amdgpu_bo_release_notify(struct ttm_buffer_object *bo) !(abo->flags & AMDGPU_GEM_CREATE_VRAM_WIPE_ON_RELEASE)) return; - reservation_object_lock(bo->base.resv, NULL); + dma_resv_lock(bo->base.resv, NULL); r = amdgpu_fill_buffer(abo, AMDGPU_POISON, bo->base.resv, &fence); if (!WARN_ON(r)) { @@ -1250,7 +1250,7 @@ void amdgpu_bo_release_notify(struct ttm_buffer_object *bo) dma_fence_put(fence); } - reservation_object_unlock(bo->base.resv); + dma_resv_unlock(bo->base.resv); } /** diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object.c b/drivers/gpu/drm/i915/gem/i915_gem_object.c index 3929c3a6b281..67dc61e02c9f 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_object.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_object.c @@ -154,7 +154,7 @@ static void __i915_gem_free_object_rcu(struct rcu_head *head) container_of(head, typeof(*obj), rcu); struct drm_i915_private *i915 = to_i915(obj->base.dev); - reservation_object_fini(&obj->base._resv); + dma_resv_fini(&obj->base._resv); i915_gem_object_free(obj); GEM_BUG_ON(!atomic_read(&i915->mm.free_count)); diff --git a/drivers/gpu/drm/i915/gt/intel_engine_pool.c b/drivers/gpu/drm/i915/gt/intel_engine_pool.c index 03d90b49584a..4cd54c569911 100644 --- a/drivers/gpu/drm/i915/gt/intel_engine_pool.c +++ b/drivers/gpu/drm/i915/gt/intel_engine_pool.c @@ -43,12 +43,12 @@ static int pool_active(struct i915_active *ref) { struct intel_engine_pool_node *node = container_of(ref, typeof(*node), active); - struct reservation_object *resv = node->obj->base.resv; + struct dma_resv *resv = node->obj->base.resv; int err; - if (reservation_object_trylock(resv)) { - reservation_object_add_excl_fence(resv, NULL); - reservation_object_unlock(resv); + if (dma_resv_trylock(resv)) { + dma_resv_add_excl_fence(resv, NULL); + dma_resv_unlock(resv); } err = i915_gem_object_pin_pages(node->obj); -- 2.20.1 -- Cheers, Stephen Rothwell diff --cc drivers/gpu/drm/i915/i915_vma.c index 8be1bbef40e5,ebfd03d117cd..000000000000 --- a/drivers/gpu/drm/i915/i915_vma.c +++ b/drivers/gpu/drm/i915/i915_vma.c @@@ -911,21 -951,16 +911,21 @@@ int i915_vma_move_to_active(struct i915 if (intel_fb_obj_invalidate(obj, ORIGIN_CS)) __i915_active_request_set(&obj->frontbuffer_write, rq); - reservation_object_add_excl_fence(vma->resv, &rq->fence); ++ dma_resv_add_excl_fence(vma->resv, &rq->fence); + obj->write_domain = I915_GEM_DOMAIN_RENDER; obj->read_domains = 0; + } else { - err = reservation_object_reserve_shared(vma->resv, 1); ++ err = dma_resv_reserve_shared(vma->resv, 1); + if (unlikely(err)) + return err; + - reservation_object_add_shared_fence(vma->resv, &rq->fence); ++ dma_resv_add_shared_fence(vma->resv, &rq->fence); + obj->write_domain = 0; } obj->read_domains |= I915_GEM_GPU_DOMAINS; + obj->mm.dirty = true; - if (flags & EXEC_OBJECT_NEEDS_FENCE) - __i915_active_request_set(&vma->last_fence, rq); - - export_fence(vma, rq, flags); + GEM_BUG_ON(!i915_vma_is_active(vma)); return 0; }

2 2

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel August 2019