Re: [PATCH libdrm 2/2] drm: merge and cleanup amdgpu_bo_free

2017-08-08 Thread Alex Deucher
On Tue, Aug 8, 2017 at 10:10 PM, Liu, Monk wrote: > I pushed it to amd-staging-upstream that branch is long dead. master tracks upstream now in internal git IIRC. > > What else branch did you refer to ? The upstream tree on freedesktop.org: https://cgit.freedesktop.org/mesa/drm Alex > > BR

RE: [PATCH libdrm 2/2] drm: merge and cleanup amdgpu_bo_free

2017-08-08 Thread Liu, Monk
I pushed it to amd-staging-upstream What else branch did you refer to ? BR Monk -Original Message- From: Alex Deucher [mailto:alexdeuc...@gmail.com] Sent: Wednesday, August 9, 2017 12:19 AM To: Christian König Cc: Liu, Monk ; amd-gfx list Subject: Re: [PATCH libdrm 2/2] drm: merge an

Re: [Intel-gfx] [PATCH libdrm] drm: Remove create_handle() drm_framebuffer "virtual".

2017-08-08 Thread Joe Kniss
I didn't mean to add libdrm, sorry, there is a separate change for that. I'll double check and test the drivers that don't implement the virtual. Thanks for the quick reply! -j On Tue, Aug 8, 2017 at 4:50 PM, Dave Airlie wrote: > On 9 August 2017 at 09:42, Joe Kniss wrote: > > Because all dri

Re: [Intel-gfx] [PATCH libdrm] drm: Remove create_handle() drm_framebuffer "virtual".

2017-08-08 Thread Dave Airlie
On 9 August 2017 at 09:42, Joe Kniss wrote: > Because all drivers currently use gem objects for framebuffer planes, > the virtual create_handle() is not required. This change adds a > struct drm_gem_object *gems[4] field to drm_framebuffer and removes > create_handle() function pointer from drm_f

umr can now VM decode on systems with IOMMU enabled

2017-08-08 Thread Tom St Denis
Hi all, I've pushed changes to umr (master) and our linux (amd-staging-4.12 should be on https://cgit.freedesktop.org/~agd5f/linux/log/?h=amd-staging-4.12 soonish) trees that allow in limited circumstances to VM decode through IOMMU which has been tested for both iommu active and inactive.

Re: [PATCH libdrm 2/2] drm: merge and cleanup amdgpu_bo_free

2017-08-08 Thread Alex Deucher
On Tue, Aug 8, 2017 at 3:54 AM, Christian König wrote: > Am 08.08.2017 um 09:34 schrieb Monk Liu: >> >> From: Monk Liu >> >> since bo_reference and bo_internal_free are >> all only used by bo_free, so we just merge them >> together >> >> Change-Id: I72ebc9c8bcfcd23f4d52a1385db871a95c23859e >> Sig

RE: [PATCH 0/3] dma-buf changes for ttm and amdgpu

2017-08-08 Thread Deucher, Alexander
> -Original Message- > From: Daniel Vetter [mailto:daniel.vet...@ffwll.ch] On Behalf Of Daniel > Vetter > Sent: Tuesday, August 08, 2017 7:57 AM > To: Alex Deucher > Cc: amd-gfx@lists.freedesktop.org; dri-de...@lists.freedesktop.org; > sumit.sem...@linaro.org; Koenig, Christian; Deucher, Al

[PATCH 5/5] drm/amdgpu: rename VM invalidated to moved

2017-08-08 Thread Christian König
From: Christian König That better describes what happens here with the BO. Signed-off-by: Christian König --- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 16 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 6 +++--- 3 files changed, 12 in

[PATCH 2/5] drm/amdgpu: remove superflous amdgpu_bo_kmap in the VM

2017-08-08 Thread Christian König
From: Christian König We now properly kmap all BOs after validation. Signed-off-by: Christian König --- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 28 +--- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu

[PATCH 3/5] drm/amdgpu: drop the extra VM huge page flag

2017-08-08 Thread Christian König
From: Christian König Just add the flags to the addr field as well. Signed-off-by: Christian König --- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 15 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 1 - 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/amd

[PATCH 4/5] drm/amdgpu: separate bo_va structure

2017-08-08 Thread Christian König
From: Christian König Split that into vm_bo_base and bo_va to allow other uses as well. Signed-off-by: Christian König --- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c| 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 14 ++ drivers/gpu

[PATCH 1/5] drm/amdgpu: cleanup static CSA handling

2017-08-08 Thread Christian König
From: Christian König Move the CSA bo_va from the VM to the fpriv structure. Signed-off-by: Christian König --- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 3 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 6 +++--- drivers/gpu/drm/amd/amdgpu/a

RE: [PATCH 2/2] drm/amdgpu: move vram usage tracking into the vram manager v2

2017-08-08 Thread Deucher, Alexander
> -Original Message- > From: amd-gfx [mailto:amd-gfx-boun...@lists.freedesktop.org] On Behalf > Of Christian König > Sent: Tuesday, August 08, 2017 8:34 AM > To: amd-gfx@lists.freedesktop.org > Subject: [PATCH 2/2] drm/amdgpu: move vram usage tracking into the vram > manager v2 > > From: C

Re: [PATCH 0/4] Fix stollen and prefered typos

2017-08-08 Thread Kent Russell
That's right, I am changing "prefered" to "preferred" in 3 and 4. Kent On 2017-08-08 08:24 AM, Christian König wrote: Patches #1 and #2 are Reviewed-by: Christian König . Regarding patches #3 and #4 I'm not a native speaker of English, but both dict.cc and thunderbird agree the correct one

RE: [PATCH 2/2] drm/amd/powerplay: fix coding style in hwmgr.c

2017-08-08 Thread Deucher, Alexander
> -Original Message- > From: amd-gfx [mailto:amd-gfx-boun...@lists.freedesktop.org] On Behalf > Of Rex Zhu > Sent: Tuesday, August 08, 2017 12:24 AM > To: amd-gfx@lists.freedesktop.org > Cc: Zhu, Rex > Subject: [PATCH 2/2] drm/amd/powerplay: fix coding style in hwmgr.c > > Change-Id: I1f31

Re: [PATCH] drm/amd/amdgpu: Add tracepoint for DMA page mapping (v3)

2017-08-08 Thread Tom St Denis
Thanks, I pushed v4 which moved the tracepoints into functions. Cheers, Tom On 08/08/17 08:01 AM, Christian König wrote: Am 08.08.2017 um 13:54 schrieb Tom St Denis: ping? Ups sorry, thought that I already send that out. One comment below. Tom On 02/08/17 07:52 AM, Tom St Denis wrote: T

Re: [PATCH 0/4] Fix stollen and prefered typos

2017-08-08 Thread Kent Russell
Thanks, I will admit that my commit messages weren't exactly clear as to what the misspelling was and what the correct spelling was. I can clarify them before pushing. Kent On 2017-08-08 08:35 AM, Christian König wrote: Ah! My fault, in this case #3 and #4 are Reviewed-by: Christian König

Re: [PATCH 0/4] Fix stollen and prefered typos

2017-08-08 Thread Christian König
Ah! My fault, in this case #3 and #4 are Reviewed-by: Christian König as well. Regards, Christian. Am 08.08.2017 um 14:34 schrieb Kent Russell: That's right, I am changing "prefered" to "preferred" in 3 and 4. Kent On 2017-08-08 08:24 AM, Christian König wrote: Patches #1 and #2 are Review

[PATCH 2/2] drm/amdgpu: move vram usage tracking into the vram manager v2

2017-08-08 Thread Christian König
From: Christian König Looks like a better place for this. v2: use atomic64_t members instead Signed-off-by: Christian König --- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 - drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 5 +- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 9 ++-- dr

[PATCH 1/2] drm/amdgpu: move gtt usage tracking into the gtt manager v2

2017-08-08 Thread Christian König
From: Christian König It doesn't make much sense to count those numbers twice. v2: use and atomic64_t instead Signed-off-by: Christian König --- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 - drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 33 +++-- drivers/gpu/drm/

[PATCH] drm/amdgpu: Not to finish an uninitialized ring

2017-08-08 Thread Trigger Huang
If a ring is not initialized, it also should not be finished. For example, in Vega10's SR-IOV environment, UVD's decode ring is not initialized, but will be finnished in amdgpu_uvd_sw_fini, because UVD driver put all the uvd decode ring's finish operation into amdgpu_uvd_sw_fini function, while not

Re: [PATCH 0/4] Fix stollen and prefered typos

2017-08-08 Thread Christian König
Patches #1 and #2 are Reviewed-by: Christian König . Regarding patches #3 and #4 I'm not a native speaker of English, but both dict.cc and thunderbird agree the correct one is actually "preferred" instead of "prefered". Regards, Christian. Am 08.08.2017 um 14:14 schrieb Kent Russell: Just

[PATCH 4/4] drm/radeon: Fix prefered typo

2017-08-08 Thread Kent Russell
Change-Id: I3353c8fadc633a7103d946846d54cc7bd49f299c Signed-off-by: Kent Russell --- drivers/gpu/drm/radeon/radeon.h| 2 +- drivers/gpu/drm/radeon/radeon_cs.c | 8 drivers/gpu/drm/radeon/radeon_object.c | 2 +- drivers/gpu/drm/radeon/radeon_vm.c | 4 ++-- 4 files changed,

[PATCH 3/4] drm/amdgpu: Fix prefered typo

2017-08-08 Thread Kent Russell
Change-Id: Ib4c58b0276943f48ded4e72959fe1574001066cd Signed-off-by: Kent Russell --- drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c | 6 +++--- drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 4 ++-- drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 8 ++

[PATCH 0/4] Fix stollen and prefered typos

2017-08-08 Thread Kent Russell
Just some fixes for typos in the amdgpu_device/radeon_device structs Kent Russell (4): drm/amdgpu: Fix stollen typo drm/radeon: Fix stollen typo drm/amdgpu: Fix prefered typo drm/radeon: Fix prefered typo drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 +- drivers/gpu/drm/amd/amdgpu/amd

[PATCH 2/4] drm/radeon: Fix stollen typo

2017-08-08 Thread Kent Russell
Change-Id: I44836001fa7469e52928d08ac3219f34ca945c42 Signed-off-by: Kent Russell --- drivers/gpu/drm/radeon/radeon.h | 2 +- drivers/gpu/drm/radeon/radeon_ttm.c | 20 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon.h b/drive

[PATCH 1/4] drm/amdgpu: Fix stollen typo

2017-08-08 Thread Kent Russell
Change-Id: I1b2464cdf6555f7047697ec17248f581f3338f08 Signed-off-by: Kent Russell --- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 12 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/dr

Re: [PATCH] drm/amd/amdgpu: Add tracepoint for DMA page mapping (v3)

2017-08-08 Thread Christian König
Am 08.08.2017 um 13:54 schrieb Tom St Denis: ping? Ups sorry, thought that I already send that out. One comment below. Tom On 02/08/17 07:52 AM, Tom St Denis wrote: This helps map DMA addresses back to physical addresses. Signed-off-by: Tom St Denis (v2): Added tracepoints for USERPTR,

Re: [PATCH 0/3] dma-buf changes for ttm and amdgpu

2017-08-08 Thread Daniel Vetter
On Mon, Aug 07, 2017 at 05:32:20PM -0400, Alex Deucher wrote: > We have some changes in ttm and amdgpu that depend on these patches. > Sumit, can you pull these in via dma-buf or should I roll them up > through my amdgpu tree? We could just throw them all into drm-misc too, that's kinda what it's

Re: [PATCH] drm/amd/amdgpu: Add tracepoint for DMA page mapping (v3)

2017-08-08 Thread Tom St Denis
ping? Tom On 02/08/17 07:52 AM, Tom St Denis wrote: This helps map DMA addresses back to physical addresses. Signed-off-by: Tom St Denis (v2): Added tracepoints for USERPTR, SG mappings, and SWIOTBL mappings. Reformatted trace call perform PCI decoding internal to the trace. (

Re: [PATCH] drm/amdgpu: Not to finish an uninitialized ring

2017-08-08 Thread Christian König
Am 08.08.2017 um 13:13 schrieb Liu, Monk: + /* Not to finish a ring which is not initialized */ Just write "don't finish the ring if not initialized" With that comment addressed, Reviewed-by: Monk Liu Additional to that the commit message is to long. Please break it after 80 chars.

RE: [PATCH] drm/amdgpu: Not to finish an uninitialized ring

2017-08-08 Thread Liu, Monk
>+ /* Not to finish a ring which is not initialized */ Just write "don't finish the ring if not initialized" With that comment addressed, Reviewed-by: Monk Liu -Original Message- From: Trigger Huang [mailto:trigger.hu...@amd.com] Sent: Tuesday, August 8, 2017 6:56 PM To: amd-gfx@

Re: [PATCH 2/7] drm/qxl: fix incorrect use of the lru_lock

2017-08-08 Thread Liu, Monk
Ack-by: Monk.Liu From: amd-gfx on behalf of Christian König Sent: Tuesday, August 8, 2017 4:14:46 PM To: amd-gfx@lists.freedesktop.org; dri-de...@lists.freedesktop.org; Dave Airlie; Gerd Hoffmann Subject: Re: [PATCH 2/7] drm/qxl: fix incorrect use of the lru_l

Re: [PATCH 2/7] drm/qxl: fix incorrect use of the lru_lock

2017-08-08 Thread Christian König
Hi guys, can I get an rb or at least an Acked-by for that one? The code was obviously copied over from radeon where it wasn't correct in the first place. Thanks, Christian. Am 07.08.2017 um 17:48 schrieb Christian König: From: Christian König The BO manager has its own lock and doesn't us

Re: [PATCH 1/7] drm/ttm: make ttm_mem_type_manager_func debug more usfull

2017-08-08 Thread Christian König
Somehow those two patches didn't ended up on dri-devel. So forwarding manually, Christian. Am 07.08.2017 um 17:48 schrieb Christian König: From: Christian König Provide the drm printer directly instead of just the callback. Signed-off-by: Christian König --- drivers/gpu/drm/amd/amdgpu/amd

Re: [PATCH libdrm 1/2] drm:fix race issue between two bo functions(v2)

2017-08-08 Thread Christian König
Am 08.08.2017 um 09:49 schrieb Liu, Monk: Please add some spaces in "src?&src->refcount:NULL" after each operator. With that fixed the patch is Reviewed-by: Christian König . Actually this " src?&src->refcount:NULL" is totally removed in second cleanup patch ... Yeah, that obviously works as

Re: [PATCH libdrm 2/2] drm: merge and cleanup amdgpu_bo_free

2017-08-08 Thread Christian König
Am 08.08.2017 um 09:34 schrieb Monk Liu: From: Monk Liu since bo_reference and bo_internal_free are all only used by bo_free, so we just merge them together Change-Id: I72ebc9c8bcfcd23f4d52a1385db871a95c23859e Signed-off-by: Monk Liu Reviewed-by: Christian König --- amdgpu/amdgpu_bo.c

[PATCH libdrm 2/2] drm: merge and cleanup amdgpu_bo_free

2017-08-08 Thread Monk Liu
From: Monk Liu since bo_reference and bo_internal_free are all only used by bo_free, so we just merge them together Change-Id: I72ebc9c8bcfcd23f4d52a1385db871a95c23859e Signed-off-by: Monk Liu --- amdgpu/amdgpu_bo.c | 52 +++- amdgpu/amdgpu_int

RE: [PATCH libdrm 1/2] drm:fix race issue between two bo functions(v2)

2017-08-08 Thread Liu, Monk
>Please add some spaces in "src?&src->refcount:NULL" after each operator. >With that fixed the patch is Reviewed-by: Christian König >. Actually this " src?&src->refcount:NULL" is totally removed in second cleanup patch ... BR Monk -Original Message- From: Christian König [mailto:dea

Re: [PATCH libdrm 1/2] drm:fix race issue between two bo functions(v2)

2017-08-08 Thread Christian König
Am 08.08.2017 um 09:34 schrieb Monk Liu: From: Monk Liu there is race issue between two threads on amdgpu_bo_reference and amdgpu_bo_import, this patch tends to fix it by moving the pthread_mutex_lock out of bo_free_internal and move to bo_reference to cover the update_reference part. The mute

[PATCH libdrm 1/2] drm:fix race issue between two bo functions(v2)

2017-08-08 Thread Monk Liu
From: Monk Liu there is race issue between two threads on amdgpu_bo_reference and amdgpu_bo_import, this patch tends to fix it by moving the pthread_mutex_lock out of bo_free_internal and move to bo_reference to cover the update_reference part. The mutex_unlock in bo_import should also cover bo

Re: [PATCH libdrm 2/2] drm:fix race issue between two bo functions(v2)

2017-08-08 Thread Christian König
If bo is NULL, above function will get you segment fault when CPU go to line "atomic_dec ..." Ah, yes of course that should be "else if (bo)". Besides, I think my original logic works fine, no need to change it at all, Yeah, it was just and idea. But thinking more about it changing all that t

Re: [PATCH 0/3] dma-buf changes for ttm and amdgpu

2017-08-08 Thread Christian König
Sorry, I wanted to ping once more on those patch but completely forgot about it. Thanks Alex for picking this up once more, Christian. Am 07.08.2017 um 23:32 schrieb Alex Deucher: We have some changes in ttm and amdgpu that depend on these patches. Sumit, can you pull these in via dma-buf or s