* [PATCH] drm/amdgpu: use 256 bit buffers for all wb allocations
@ 2017-07-28 16:15 Alex Deucher
[not found] ` <1501258540-9950-1-git-send-email-alexander.deucher-5C7GfCeVMHo@public.gmane.org>
0 siblings, 1 reply; 5+ messages in thread
From: Alex Deucher @ 2017-07-28 16:15 UTC (permalink / raw)
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW; +Cc: Alex Deucher
May waste a bit of memory, but simplifies the interface
significantly.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu.h | 4 --
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 65 ------------------------------
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 65 ++++++++----------------------
drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 8 ++--
4 files changed, 20 insertions(+), 122 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index ed1b688..c880851 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -1190,10 +1190,6 @@ struct amdgpu_wb {
int amdgpu_wb_get(struct amdgpu_device *adev, u32 *wb);
void amdgpu_wb_free(struct amdgpu_device *adev, u32 wb);
-int amdgpu_wb_get_64bit(struct amdgpu_device *adev, u32 *wb);
-int amdgpu_wb_get_256bit(struct amdgpu_device *adev, u32 *wb);
-void amdgpu_wb_free_64bit(struct amdgpu_device *adev, u32 wb);
-void amdgpu_wb_free_256bit(struct amdgpu_device *adev, u32 wb);
void amdgpu_get_pcie_info(struct amdgpu_device *adev);
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index c2ddeb1..d422277 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -570,41 +570,6 @@ static int amdgpu_wb_init(struct amdgpu_device *adev)
*/
int amdgpu_wb_get(struct amdgpu_device *adev, u32 *wb)
{
- unsigned long offset = find_first_zero_bit(adev->wb.used, adev->wb.num_wb);
- if (offset < adev->wb.num_wb) {
- __set_bit(offset, adev->wb.used);
- *wb = offset;
- return 0;
- } else {
- return -EINVAL;
- }
-}
-
-/**
- * amdgpu_wb_get_64bit - Allocate a wb entry
- *
- * @adev: amdgpu_device pointer
- * @wb: wb index
- *
- * Allocate a wb slot for use by the driver (all asics).
- * Returns 0 on success or -EINVAL on failure.
- */
-int amdgpu_wb_get_64bit(struct amdgpu_device *adev, u32 *wb)
-{
- unsigned long offset = bitmap_find_next_zero_area_off(adev->wb.used,
- adev->wb.num_wb, 0, 2, 7, 0);
- if ((offset + 1) < adev->wb.num_wb) {
- __set_bit(offset, adev->wb.used);
- __set_bit(offset + 1, adev->wb.used);
- *wb = offset;
- return 0;
- } else {
- return -EINVAL;
- }
-}
-
-int amdgpu_wb_get_256bit(struct amdgpu_device *adev, u32 *wb)
-{
int i = 0;
unsigned long offset = bitmap_find_next_zero_area_off(adev->wb.used,
adev->wb.num_wb, 0, 8, 63, 0);
@@ -628,36 +593,6 @@ int amdgpu_wb_get_256bit(struct amdgpu_device *adev, u32 *wb)
*/
void amdgpu_wb_free(struct amdgpu_device *adev, u32 wb)
{
- if (wb < adev->wb.num_wb)
- __clear_bit(wb, adev->wb.used);
-}
-
-/**
- * amdgpu_wb_free_64bit - Free a wb entry
- *
- * @adev: amdgpu_device pointer
- * @wb: wb index
- *
- * Free a wb slot allocated for use by the driver (all asics)
- */
-void amdgpu_wb_free_64bit(struct amdgpu_device *adev, u32 wb)
-{
- if ((wb + 1) < adev->wb.num_wb) {
- __clear_bit(wb, adev->wb.used);
- __clear_bit(wb + 1, adev->wb.used);
- }
-}
-
-/**
- * amdgpu_wb_free_256bit - Free a wb entry
- *
- * @adev: amdgpu_device pointer
- * @wb: wb index
- *
- * Free a wb slot allocated for use by the driver (all asics)
- */
-void amdgpu_wb_free_256bit(struct amdgpu_device *adev, u32 wb)
-{
int i = 0;
if ((wb + 7) < adev->wb.num_wb)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
index 3874be8..704475674 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
@@ -184,47 +184,22 @@ int amdgpu_ring_init(struct amdgpu_device *adev, struct amdgpu_ring *ring,
return r;
}
- if (ring->funcs->support_64bit_ptrs) {
- r = amdgpu_wb_get_64bit(adev, &ring->rptr_offs);
- if (r) {
- dev_err(adev->dev, "(%d) ring rptr_offs wb alloc failed\n", r);
- return r;
- }
-
- r = amdgpu_wb_get_64bit(adev, &ring->wptr_offs);
- if (r) {
- dev_err(adev->dev, "(%d) ring wptr_offs wb alloc failed\n", r);
- return r;
- }
-
- } else {
- r = amdgpu_wb_get(adev, &ring->rptr_offs);
- if (r) {
- dev_err(adev->dev, "(%d) ring rptr_offs wb alloc failed\n", r);
- return r;
- }
-
- r = amdgpu_wb_get(adev, &ring->wptr_offs);
- if (r) {
- dev_err(adev->dev, "(%d) ring wptr_offs wb alloc failed\n", r);
- return r;
- }
-
+ r = amdgpu_wb_get(adev, &ring->rptr_offs);
+ if (r) {
+ dev_err(adev->dev, "(%d) ring rptr_offs wb alloc failed\n", r);
+ return r;
}
- if (amdgpu_sriov_vf(adev) && ring->funcs->type == AMDGPU_RING_TYPE_GFX) {
- r = amdgpu_wb_get_256bit(adev, &ring->fence_offs);
- if (r) {
- dev_err(adev->dev, "(%d) ring fence_offs wb alloc failed\n", r);
- return r;
- }
+ r = amdgpu_wb_get(adev, &ring->wptr_offs);
+ if (r) {
+ dev_err(adev->dev, "(%d) ring wptr_offs wb alloc failed\n", r);
+ return r;
+ }
- } else {
- r = amdgpu_wb_get(adev, &ring->fence_offs);
- if (r) {
- dev_err(adev->dev, "(%d) ring fence_offs wb alloc failed\n", r);
- return r;
- }
+ r = amdgpu_wb_get(adev, &ring->fence_offs);
+ if (r) {
+ dev_err(adev->dev, "(%d) ring fence_offs wb alloc failed\n", r);
+ return r;
}
r = amdgpu_wb_get(adev, &ring->cond_exe_offs);
@@ -286,19 +261,11 @@ void amdgpu_ring_fini(struct amdgpu_ring *ring)
{
ring->ready = false;
- if (ring->funcs->support_64bit_ptrs) {
- amdgpu_wb_free_64bit(ring->adev, ring->rptr_offs);
- amdgpu_wb_free_64bit(ring->adev, ring->wptr_offs);
- } else {
- amdgpu_wb_free(ring->adev, ring->rptr_offs);
- amdgpu_wb_free(ring->adev, ring->wptr_offs);
- }
+ amdgpu_wb_free(ring->adev, ring->rptr_offs);
+ amdgpu_wb_free(ring->adev, ring->wptr_offs);
amdgpu_wb_free(ring->adev, ring->cond_exe_offs);
- if (amdgpu_sriov_vf(ring->adev) && ring->funcs->type == AMDGPU_RING_TYPE_GFX)
- amdgpu_wb_free_256bit(ring->adev, ring->fence_offs);
- else
- amdgpu_wb_free(ring->adev, ring->fence_offs);
+ amdgpu_wb_free(ring->adev, ring->fence_offs);
amdgpu_bo_free_kernel(&ring->ring_obj,
&ring->gpu_addr,
diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
index 5c24708..8273e63 100644
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
@@ -1278,8 +1278,8 @@ static int sdma_v4_0_sw_init(void *handle)
AMDGPU_SDMA_IRQ_TRAP1);
if (amdgpu_sriov_vf(adev)) {
- r = amdgpu_wb_get_64bit(adev,
- &adev->sdma.instance[i].poll_mem_offs);
+ r = amdgpu_wb_get(adev,
+ &adev->sdma.instance[i].poll_mem_offs);
if (r) {
dev_err(adev->dev, "(%d) failed to allocate SDMA poll mem wb.\n", r);
return r;
@@ -1301,8 +1301,8 @@ static int sdma_v4_0_sw_fini(void *handle)
amdgpu_ring_fini(&adev->sdma.instance[i].ring);
if (amdgpu_sriov_vf(adev))
- amdgpu_wb_free_64bit(adev,
- adev->sdma.instance[i].poll_mem_offs);
+ amdgpu_wb_free(adev,
+ adev->sdma.instance[i].poll_mem_offs);
}
return 0;
}
--
2.5.5
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] drm/amdgpu: use 256 bit buffers for all wb allocations
[not found] ` <1501258540-9950-1-git-send-email-alexander.deucher-5C7GfCeVMHo@public.gmane.org>
@ 2017-07-28 18:10 ` Christian König
2017-07-28 22:08 ` Andy Furniss
1 sibling, 0 replies; 5+ messages in thread
From: Christian König @ 2017-07-28 18:10 UTC (permalink / raw)
To: Alex Deucher, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW; +Cc: Alex Deucher
Am 28.07.2017 um 18:15 schrieb Alex Deucher:
> May waste a bit of memory, but simplifies the interface
> significantly.
>
> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu.h | 4 --
> drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 65 ------------------------------
> drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 65 ++++++++----------------------
> drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 8 ++--
> 4 files changed, 20 insertions(+), 122 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> index ed1b688..c880851 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> @@ -1190,10 +1190,6 @@ struct amdgpu_wb {
>
> int amdgpu_wb_get(struct amdgpu_device *adev, u32 *wb);
> void amdgpu_wb_free(struct amdgpu_device *adev, u32 wb);
> -int amdgpu_wb_get_64bit(struct amdgpu_device *adev, u32 *wb);
> -int amdgpu_wb_get_256bit(struct amdgpu_device *adev, u32 *wb);
> -void amdgpu_wb_free_64bit(struct amdgpu_device *adev, u32 wb);
> -void amdgpu_wb_free_256bit(struct amdgpu_device *adev, u32 wb);
>
> void amdgpu_get_pcie_info(struct amdgpu_device *adev);
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> index c2ddeb1..d422277 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> @@ -570,41 +570,6 @@ static int amdgpu_wb_init(struct amdgpu_device *adev)
> */
> int amdgpu_wb_get(struct amdgpu_device *adev, u32 *wb)
> {
> - unsigned long offset = find_first_zero_bit(adev->wb.used, adev->wb.num_wb);
> - if (offset < adev->wb.num_wb) {
> - __set_bit(offset, adev->wb.used);
> - *wb = offset;
> - return 0;
> - } else {
> - return -EINVAL;
> - }
> -}
> -
> -/**
> - * amdgpu_wb_get_64bit - Allocate a wb entry
> - *
> - * @adev: amdgpu_device pointer
> - * @wb: wb index
> - *
> - * Allocate a wb slot for use by the driver (all asics).
> - * Returns 0 on success or -EINVAL on failure.
> - */
> -int amdgpu_wb_get_64bit(struct amdgpu_device *adev, u32 *wb)
> -{
> - unsigned long offset = bitmap_find_next_zero_area_off(adev->wb.used,
> - adev->wb.num_wb, 0, 2, 7, 0);
> - if ((offset + 1) < adev->wb.num_wb) {
> - __set_bit(offset, adev->wb.used);
> - __set_bit(offset + 1, adev->wb.used);
> - *wb = offset;
> - return 0;
> - } else {
> - return -EINVAL;
> - }
> -}
> -
> -int amdgpu_wb_get_256bit(struct amdgpu_device *adev, u32 *wb)
> -{
> int i = 0;
> unsigned long offset = bitmap_find_next_zero_area_off(adev->wb.used,
> adev->wb.num_wb, 0, 8, 63, 0);
Could be simplified to find_first_zero_bit() as well and then just
multiply the resulting offset by 16.
Either way the patch looks good to me and is Reviewed-by: Christian
König <christian.koenig@amd.com>.
Regards,
Christian.
> @@ -628,36 +593,6 @@ int amdgpu_wb_get_256bit(struct amdgpu_device *adev, u32 *wb)
> */
> void amdgpu_wb_free(struct amdgpu_device *adev, u32 wb)
> {
> - if (wb < adev->wb.num_wb)
> - __clear_bit(wb, adev->wb.used);
> -}
> -
> -/**
> - * amdgpu_wb_free_64bit - Free a wb entry
> - *
> - * @adev: amdgpu_device pointer
> - * @wb: wb index
> - *
> - * Free a wb slot allocated for use by the driver (all asics)
> - */
> -void amdgpu_wb_free_64bit(struct amdgpu_device *adev, u32 wb)
> -{
> - if ((wb + 1) < adev->wb.num_wb) {
> - __clear_bit(wb, adev->wb.used);
> - __clear_bit(wb + 1, adev->wb.used);
> - }
> -}
> -
> -/**
> - * amdgpu_wb_free_256bit - Free a wb entry
> - *
> - * @adev: amdgpu_device pointer
> - * @wb: wb index
> - *
> - * Free a wb slot allocated for use by the driver (all asics)
> - */
> -void amdgpu_wb_free_256bit(struct amdgpu_device *adev, u32 wb)
> -{
> int i = 0;
>
> if ((wb + 7) < adev->wb.num_wb)
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
> index 3874be8..704475674 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
> @@ -184,47 +184,22 @@ int amdgpu_ring_init(struct amdgpu_device *adev, struct amdgpu_ring *ring,
> return r;
> }
>
> - if (ring->funcs->support_64bit_ptrs) {
> - r = amdgpu_wb_get_64bit(adev, &ring->rptr_offs);
> - if (r) {
> - dev_err(adev->dev, "(%d) ring rptr_offs wb alloc failed\n", r);
> - return r;
> - }
> -
> - r = amdgpu_wb_get_64bit(adev, &ring->wptr_offs);
> - if (r) {
> - dev_err(adev->dev, "(%d) ring wptr_offs wb alloc failed\n", r);
> - return r;
> - }
> -
> - } else {
> - r = amdgpu_wb_get(adev, &ring->rptr_offs);
> - if (r) {
> - dev_err(adev->dev, "(%d) ring rptr_offs wb alloc failed\n", r);
> - return r;
> - }
> -
> - r = amdgpu_wb_get(adev, &ring->wptr_offs);
> - if (r) {
> - dev_err(adev->dev, "(%d) ring wptr_offs wb alloc failed\n", r);
> - return r;
> - }
> -
> + r = amdgpu_wb_get(adev, &ring->rptr_offs);
> + if (r) {
> + dev_err(adev->dev, "(%d) ring rptr_offs wb alloc failed\n", r);
> + return r;
> }
>
> - if (amdgpu_sriov_vf(adev) && ring->funcs->type == AMDGPU_RING_TYPE_GFX) {
> - r = amdgpu_wb_get_256bit(adev, &ring->fence_offs);
> - if (r) {
> - dev_err(adev->dev, "(%d) ring fence_offs wb alloc failed\n", r);
> - return r;
> - }
> + r = amdgpu_wb_get(adev, &ring->wptr_offs);
> + if (r) {
> + dev_err(adev->dev, "(%d) ring wptr_offs wb alloc failed\n", r);
> + return r;
> + }
>
> - } else {
> - r = amdgpu_wb_get(adev, &ring->fence_offs);
> - if (r) {
> - dev_err(adev->dev, "(%d) ring fence_offs wb alloc failed\n", r);
> - return r;
> - }
> + r = amdgpu_wb_get(adev, &ring->fence_offs);
> + if (r) {
> + dev_err(adev->dev, "(%d) ring fence_offs wb alloc failed\n", r);
> + return r;
> }
>
> r = amdgpu_wb_get(adev, &ring->cond_exe_offs);
> @@ -286,19 +261,11 @@ void amdgpu_ring_fini(struct amdgpu_ring *ring)
> {
> ring->ready = false;
>
> - if (ring->funcs->support_64bit_ptrs) {
> - amdgpu_wb_free_64bit(ring->adev, ring->rptr_offs);
> - amdgpu_wb_free_64bit(ring->adev, ring->wptr_offs);
> - } else {
> - amdgpu_wb_free(ring->adev, ring->rptr_offs);
> - amdgpu_wb_free(ring->adev, ring->wptr_offs);
> - }
> + amdgpu_wb_free(ring->adev, ring->rptr_offs);
> + amdgpu_wb_free(ring->adev, ring->wptr_offs);
>
> amdgpu_wb_free(ring->adev, ring->cond_exe_offs);
> - if (amdgpu_sriov_vf(ring->adev) && ring->funcs->type == AMDGPU_RING_TYPE_GFX)
> - amdgpu_wb_free_256bit(ring->adev, ring->fence_offs);
> - else
> - amdgpu_wb_free(ring->adev, ring->fence_offs);
> + amdgpu_wb_free(ring->adev, ring->fence_offs);
>
> amdgpu_bo_free_kernel(&ring->ring_obj,
> &ring->gpu_addr,
> diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
> index 5c24708..8273e63 100644
> --- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
> @@ -1278,8 +1278,8 @@ static int sdma_v4_0_sw_init(void *handle)
> AMDGPU_SDMA_IRQ_TRAP1);
>
> if (amdgpu_sriov_vf(adev)) {
> - r = amdgpu_wb_get_64bit(adev,
> - &adev->sdma.instance[i].poll_mem_offs);
> + r = amdgpu_wb_get(adev,
> + &adev->sdma.instance[i].poll_mem_offs);
> if (r) {
> dev_err(adev->dev, "(%d) failed to allocate SDMA poll mem wb.\n", r);
> return r;
> @@ -1301,8 +1301,8 @@ static int sdma_v4_0_sw_fini(void *handle)
> amdgpu_ring_fini(&adev->sdma.instance[i].ring);
>
> if (amdgpu_sriov_vf(adev))
> - amdgpu_wb_free_64bit(adev,
> - adev->sdma.instance[i].poll_mem_offs);
> + amdgpu_wb_free(adev,
> + adev->sdma.instance[i].poll_mem_offs);
> }
> return 0;
> }
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] drm/amdgpu: use 256 bit buffers for all wb allocations
[not found] ` <1501258540-9950-1-git-send-email-alexander.deucher-5C7GfCeVMHo@public.gmane.org>
2017-07-28 18:10 ` Christian König
@ 2017-07-28 22:08 ` Andy Furniss
[not found] ` <b589c629-dc1e-0cd4-80e5-aa6b1aa910ab-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
1 sibling, 1 reply; 5+ messages in thread
From: Andy Furniss @ 2017-07-28 22:08 UTC (permalink / raw)
To: Alex Deucher, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW; +Cc: Alex Deucher
Alex Deucher wrote:
> May waste a bit of memory, but simplifies the interface
> significantly.
Can't boot tonga with this (testing 4.14-wip)
Jul 28 23:00:29 ph4 kernel: [drm] amdgpu kernel modesetting enabled.
Jul 28 23:00:29 ph4 kernel: [drm] initializing kernel modesetting (TONGA
0x1002:0x6939 0x1458:0x229D 0x00).
Jul 28 23:00:29 ph4 kernel: [drm] register mmio base: 0xFEA00000
Jul 28 23:00:29 ph4 kernel: [drm] register mmio size: 262144
Jul 28 23:00:29 ph4 kernel: [drm] probing gen 2 caps for device
1002:5a16 = 31cd02/0
Jul 28 23:00:29 ph4 kernel: [drm] probing mlw for device 1002:5a16 = 31cd02
Jul 28 23:00:29 ph4 kernel: [drm] VCE enabled in physical mode
Jul 28 23:00:29 ph4 kernel: amdgpu 0000:01:00.0: Invalid PCI ROM header
signature: expecting 0xaa55, got 0x8b00
Jul 28 23:00:29 ph4 kernel: ATOM BIOS: 113-xxx-Xxx
Jul 28 23:00:29 ph4 kernel: [drm] GPU post is not needed
Jul 28 23:00:29 ph4 kernel: [drm] Changing default dispclk from 600Mhz
to 625Mhz
Jul 28 23:00:29 ph4 kernel: [drm] vm size is 64 GB, block size is 13-bit
Jul 28 23:00:29 ph4 kernel: amdgpu 0000:01:00.0: VRAM: 2048M
0x000000F400000000 - 0x000000F47FFFFFFF (2048M used)
Jul 28 23:00:29 ph4 kernel: amdgpu 0000:01:00.0: GTT: 256M
0x0000000000000000 - 0x000000000FFFFFFF
Jul 28 23:00:29 ph4 kernel: [drm] Detected VRAM RAM=2048M, BAR=256M
Jul 28 23:00:29 ph4 kernel: [drm] RAM width 256bits GDDR5
Jul 28 23:00:29 ph4 kernel: [TTM] Zone kernel: Available graphics
memory: 4069418 kiB
Jul 28 23:00:29 ph4 kernel: [TTM] Zone dma32: Available graphics
memory: 2097152 kiB
Jul 28 23:00:29 ph4 kernel: [TTM] Initializing pool allocator
Jul 28 23:00:29 ph4 kernel: [TTM] Initializing DMA pool allocator
Jul 28 23:00:29 ph4 kernel: [drm] amdgpu: 2048M of VRAM memory ready
Jul 28 23:00:29 ph4 kernel: [drm] amdgpu: 3072M of GTT memory ready.
Jul 28 23:00:29 ph4 kernel: [drm] GART: num cpu pages 65536, num gpu
pages 65536
Jul 28 23:00:29 ph4 kernel: [drm] PCIE GART of 256M enabled (table at
0x000000F400040000).
Jul 28 23:00:29 ph4 kernel: [drm] Supports vblank timestamp caching Rev
2 (21.10.2013).
Jul 28 23:00:29 ph4 kernel: [drm] Driver supports precise vblank
timestamp query.
Jul 28 23:00:29 ph4 kernel: amdgpu 0000:01:00.0: amdgpu: using MSI.
Jul 28 23:00:29 ph4 kernel: [drm] amdgpu: irq initialized.
Jul 28 23:00:29 ph4 kernel: amdgpu: [powerplay] amdgpu: powerplay sw
initialized
Jul 28 23:00:29 ph4 kernel: [drm] AMDGPU Display Connectors
Jul 28 23:00:29 ph4 kernel: [drm] Connector 0:
Jul 28 23:00:29 ph4 kernel: [drm] DP-1
Jul 28 23:00:29 ph4 kernel: [drm] HPD4
Jul 28 23:00:29 ph4 kernel: [drm] DDC: 0x4868 0x4868 0x4869 0x4869
0x486a 0x486a 0x486b 0x486b
Jul 28 23:00:29 ph4 kernel: [drm] Encoders:
Jul 28 23:00:29 ph4 kernel: [drm] DFP1: INTERNAL_UNIPHY1
Jul 28 23:00:29 ph4 kernel: [drm] Connector 1:
Jul 28 23:00:29 ph4 kernel: [drm] HDMI-A-1
Jul 28 23:00:29 ph4 kernel: [drm] HPD5
Jul 28 23:00:29 ph4 kernel: [drm] DDC: 0x4870 0x4870 0x4871 0x4871
0x4872 0x4872 0x4873 0x4873
Jul 28 23:00:29 ph4 kernel: [drm] Encoders:
Jul 28 23:00:29 ph4 kernel: [drm] DFP2: INTERNAL_UNIPHY1
Jul 28 23:00:29 ph4 kernel: [drm] Connector 2:
Jul 28 23:00:29 ph4 kernel: [drm] DVI-D-1
Jul 28 23:00:29 ph4 kernel: [drm] HPD1
Jul 28 23:00:29 ph4 kernel: [drm] DDC: 0x4878 0x4878 0x4879 0x4879
0x487a 0x487a 0x487b 0x487b
Jul 28 23:00:29 ph4 kernel: [drm] Encoders:
Jul 28 23:00:29 ph4 kernel: [drm] DFP3: INTERNAL_UNIPHY
Jul 28 23:00:29 ph4 kernel: [drm] Connector 3:
Jul 28 23:00:29 ph4 kernel: [drm] DVI-I-1
Jul 28 23:00:29 ph4 kernel: [drm] HPD6
Jul 28 23:00:29 ph4 kernel: [drm] DDC: 0x487c 0x487c 0x487d 0x487d
0x487e 0x487e 0x487f 0x487f
Jul 28 23:00:29 ph4 kernel: [drm] Encoders:
Jul 28 23:00:29 ph4 kernel: [drm] DFP4: INTERNAL_UNIPHY2
Jul 28 23:00:29 ph4 kernel: [drm] CRT1: INTERNAL_KLDSCP_DAC1
Jul 28 23:00:29 ph4 kernel: amdgpu 0000:01:00.0: fence driver on ring 0
use gpu addr 0x0000000000400200, cpu addr 0xffff88022e059200
Jul 28 23:00:29 ph4 kernel: amdgpu 0000:01:00.0: fence driver on ring 1
use gpu addr 0x0000000000400600, cpu addr 0xffff88022e059600
Jul 28 23:00:29 ph4 kernel: amdgpu 0000:01:00.0: fence driver on ring 2
use gpu addr 0x0000000000400a00, cpu addr 0xffff88022e059a00
Jul 28 23:00:29 ph4 kernel: amdgpu 0000:01:00.0: fence driver on ring 3
use gpu addr 0x0000000000400e00, cpu addr 0xffff88022e059e00
Jul 28 23:00:29 ph4 kernel: amdgpu 0000:01:00.0: (-22) ring rptr_offs wb
alloc failed
Jul 28 23:00:29 ph4 kernel: [drm:amdgpu_device_init [amdgpu]] *ERROR*
sw_init of IP block <gfx_v8_0> failed -22
Jul 28 23:00:29 ph4 kernel: amdgpu 0000:01:00.0: amdgpu_init failed
Jul 28 23:00:29 ph4 kernel: [TTM] Finalizing pool allocator
Jul 28 23:00:29 ph4 kernel: [TTM] Finalizing DMA pool allocator
Jul 28 23:00:29 ph4 kernel: [TTM] Zone kernel: Used memory at exit: 73 kiB
Jul 28 23:00:29 ph4 kernel: [TTM] Zone dma32: Used memory at exit: 25 kiB
Jul 28 23:00:29 ph4 kernel: [drm] amdgpu: ttm finalized
Jul 28 23:00:29 ph4 kernel: amdgpu 0000:01:00.0: Fatal error during GPU init
Jul 28 23:00:29 ph4 kernel: [drm] amdgpu: finishing device.
Jul 28 23:00:29 ph4 kernel: [TTM] Memory type 2 has not been initialized
Jul 28 23:00:29 ph4 kernel: amdgpu: probe of 0000:01:00.0 failed with
error -22
>
> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu.h | 4 --
> drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 65 ------------------------------
> drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 65 ++++++++----------------------
> drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 8 ++--
> 4 files changed, 20 insertions(+), 122 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> index ed1b688..c880851 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> @@ -1190,10 +1190,6 @@ struct amdgpu_wb {
>
> int amdgpu_wb_get(struct amdgpu_device *adev, u32 *wb);
> void amdgpu_wb_free(struct amdgpu_device *adev, u32 wb);
> -int amdgpu_wb_get_64bit(struct amdgpu_device *adev, u32 *wb);
> -int amdgpu_wb_get_256bit(struct amdgpu_device *adev, u32 *wb);
> -void amdgpu_wb_free_64bit(struct amdgpu_device *adev, u32 wb);
> -void amdgpu_wb_free_256bit(struct amdgpu_device *adev, u32 wb);
>
> void amdgpu_get_pcie_info(struct amdgpu_device *adev);
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> index c2ddeb1..d422277 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> @@ -570,41 +570,6 @@ static int amdgpu_wb_init(struct amdgpu_device *adev)
> */
> int amdgpu_wb_get(struct amdgpu_device *adev, u32 *wb)
> {
> - unsigned long offset = find_first_zero_bit(adev->wb.used, adev->wb.num_wb);
> - if (offset < adev->wb.num_wb) {
> - __set_bit(offset, adev->wb.used);
> - *wb = offset;
> - return 0;
> - } else {
> - return -EINVAL;
> - }
> -}
> -
> -/**
> - * amdgpu_wb_get_64bit - Allocate a wb entry
> - *
> - * @adev: amdgpu_device pointer
> - * @wb: wb index
> - *
> - * Allocate a wb slot for use by the driver (all asics).
> - * Returns 0 on success or -EINVAL on failure.
> - */
> -int amdgpu_wb_get_64bit(struct amdgpu_device *adev, u32 *wb)
> -{
> - unsigned long offset = bitmap_find_next_zero_area_off(adev->wb.used,
> - adev->wb.num_wb, 0, 2, 7, 0);
> - if ((offset + 1) < adev->wb.num_wb) {
> - __set_bit(offset, adev->wb.used);
> - __set_bit(offset + 1, adev->wb.used);
> - *wb = offset;
> - return 0;
> - } else {
> - return -EINVAL;
> - }
> -}
> -
> -int amdgpu_wb_get_256bit(struct amdgpu_device *adev, u32 *wb)
> -{
> int i = 0;
> unsigned long offset = bitmap_find_next_zero_area_off(adev->wb.used,
> adev->wb.num_wb, 0, 8, 63, 0);
> @@ -628,36 +593,6 @@ int amdgpu_wb_get_256bit(struct amdgpu_device *adev, u32 *wb)
> */
> void amdgpu_wb_free(struct amdgpu_device *adev, u32 wb)
> {
> - if (wb < adev->wb.num_wb)
> - __clear_bit(wb, adev->wb.used);
> -}
> -
> -/**
> - * amdgpu_wb_free_64bit - Free a wb entry
> - *
> - * @adev: amdgpu_device pointer
> - * @wb: wb index
> - *
> - * Free a wb slot allocated for use by the driver (all asics)
> - */
> -void amdgpu_wb_free_64bit(struct amdgpu_device *adev, u32 wb)
> -{
> - if ((wb + 1) < adev->wb.num_wb) {
> - __clear_bit(wb, adev->wb.used);
> - __clear_bit(wb + 1, adev->wb.used);
> - }
> -}
> -
> -/**
> - * amdgpu_wb_free_256bit - Free a wb entry
> - *
> - * @adev: amdgpu_device pointer
> - * @wb: wb index
> - *
> - * Free a wb slot allocated for use by the driver (all asics)
> - */
> -void amdgpu_wb_free_256bit(struct amdgpu_device *adev, u32 wb)
> -{
> int i = 0;
>
> if ((wb + 7) < adev->wb.num_wb)
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
> index 3874be8..704475674 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
> @@ -184,47 +184,22 @@ int amdgpu_ring_init(struct amdgpu_device *adev, struct amdgpu_ring *ring,
> return r;
> }
>
> - if (ring->funcs->support_64bit_ptrs) {
> - r = amdgpu_wb_get_64bit(adev, &ring->rptr_offs);
> - if (r) {
> - dev_err(adev->dev, "(%d) ring rptr_offs wb alloc failed\n", r);
> - return r;
> - }
> -
> - r = amdgpu_wb_get_64bit(adev, &ring->wptr_offs);
> - if (r) {
> - dev_err(adev->dev, "(%d) ring wptr_offs wb alloc failed\n", r);
> - return r;
> - }
> -
> - } else {
> - r = amdgpu_wb_get(adev, &ring->rptr_offs);
> - if (r) {
> - dev_err(adev->dev, "(%d) ring rptr_offs wb alloc failed\n", r);
> - return r;
> - }
> -
> - r = amdgpu_wb_get(adev, &ring->wptr_offs);
> - if (r) {
> - dev_err(adev->dev, "(%d) ring wptr_offs wb alloc failed\n", r);
> - return r;
> - }
> -
> + r = amdgpu_wb_get(adev, &ring->rptr_offs);
> + if (r) {
> + dev_err(adev->dev, "(%d) ring rptr_offs wb alloc failed\n", r);
> + return r;
> }
>
> - if (amdgpu_sriov_vf(adev) && ring->funcs->type == AMDGPU_RING_TYPE_GFX) {
> - r = amdgpu_wb_get_256bit(adev, &ring->fence_offs);
> - if (r) {
> - dev_err(adev->dev, "(%d) ring fence_offs wb alloc failed\n", r);
> - return r;
> - }
> + r = amdgpu_wb_get(adev, &ring->wptr_offs);
> + if (r) {
> + dev_err(adev->dev, "(%d) ring wptr_offs wb alloc failed\n", r);
> + return r;
> + }
>
> - } else {
> - r = amdgpu_wb_get(adev, &ring->fence_offs);
> - if (r) {
> - dev_err(adev->dev, "(%d) ring fence_offs wb alloc failed\n", r);
> - return r;
> - }
> + r = amdgpu_wb_get(adev, &ring->fence_offs);
> + if (r) {
> + dev_err(adev->dev, "(%d) ring fence_offs wb alloc failed\n", r);
> + return r;
> }
>
> r = amdgpu_wb_get(adev, &ring->cond_exe_offs);
> @@ -286,19 +261,11 @@ void amdgpu_ring_fini(struct amdgpu_ring *ring)
> {
> ring->ready = false;
>
> - if (ring->funcs->support_64bit_ptrs) {
> - amdgpu_wb_free_64bit(ring->adev, ring->rptr_offs);
> - amdgpu_wb_free_64bit(ring->adev, ring->wptr_offs);
> - } else {
> - amdgpu_wb_free(ring->adev, ring->rptr_offs);
> - amdgpu_wb_free(ring->adev, ring->wptr_offs);
> - }
> + amdgpu_wb_free(ring->adev, ring->rptr_offs);
> + amdgpu_wb_free(ring->adev, ring->wptr_offs);
>
> amdgpu_wb_free(ring->adev, ring->cond_exe_offs);
> - if (amdgpu_sriov_vf(ring->adev) && ring->funcs->type == AMDGPU_RING_TYPE_GFX)
> - amdgpu_wb_free_256bit(ring->adev, ring->fence_offs);
> - else
> - amdgpu_wb_free(ring->adev, ring->fence_offs);
> + amdgpu_wb_free(ring->adev, ring->fence_offs);
>
> amdgpu_bo_free_kernel(&ring->ring_obj,
> &ring->gpu_addr,
> diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
> index 5c24708..8273e63 100644
> --- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
> @@ -1278,8 +1278,8 @@ static int sdma_v4_0_sw_init(void *handle)
> AMDGPU_SDMA_IRQ_TRAP1);
>
> if (amdgpu_sriov_vf(adev)) {
> - r = amdgpu_wb_get_64bit(adev,
> - &adev->sdma.instance[i].poll_mem_offs);
> + r = amdgpu_wb_get(adev,
> + &adev->sdma.instance[i].poll_mem_offs);
> if (r) {
> dev_err(adev->dev, "(%d) failed to allocate SDMA poll mem wb.\n", r);
> return r;
> @@ -1301,8 +1301,8 @@ static int sdma_v4_0_sw_fini(void *handle)
> amdgpu_ring_fini(&adev->sdma.instance[i].ring);
>
> if (amdgpu_sriov_vf(adev))
> - amdgpu_wb_free_64bit(adev,
> - adev->sdma.instance[i].poll_mem_offs);
> + amdgpu_wb_free(adev,
> + adev->sdma.instance[i].poll_mem_offs);
> }
> return 0;
> }
>
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] drm/amdgpu: use 256 bit buffers for all wb allocations
[not found] ` <b589c629-dc1e-0cd4-80e5-aa6b1aa910ab-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
@ 2017-07-28 22:15 ` Alex Deucher
[not found] ` <CADnq5_PumnBBWeb0j2KyxSURtizKrMUrY4FWH1TKn4wX9L+Gxw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
0 siblings, 1 reply; 5+ messages in thread
From: Alex Deucher @ 2017-07-28 22:15 UTC (permalink / raw)
To: Andy Furniss; +Cc: Alex Deucher, amd-gfx list
[-- Attachment #1: Type: text/plain, Size: 14545 bytes --]
On Fri, Jul 28, 2017 at 6:08 PM, Andy Furniss <adf.lists-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:
> Alex Deucher wrote:
>>
>> May waste a bit of memory, but simplifies the interface
>> significantly.
>
>
> Can't boot tonga with this (testing 4.14-wip)
Should be fixed with this patch.
Alex
>
> Jul 28 23:00:29 ph4 kernel: [drm] amdgpu kernel modesetting enabled.
> Jul 28 23:00:29 ph4 kernel: [drm] initializing kernel modesetting (TONGA
> 0x1002:0x6939 0x1458:0x229D 0x00).
> Jul 28 23:00:29 ph4 kernel: [drm] register mmio base: 0xFEA00000
> Jul 28 23:00:29 ph4 kernel: [drm] register mmio size: 262144
> Jul 28 23:00:29 ph4 kernel: [drm] probing gen 2 caps for device 1002:5a16 =
> 31cd02/0
> Jul 28 23:00:29 ph4 kernel: [drm] probing mlw for device 1002:5a16 = 31cd02
> Jul 28 23:00:29 ph4 kernel: [drm] VCE enabled in physical mode
> Jul 28 23:00:29 ph4 kernel: amdgpu 0000:01:00.0: Invalid PCI ROM header
> signature: expecting 0xaa55, got 0x8b00
> Jul 28 23:00:29 ph4 kernel: ATOM BIOS: 113-xxx-Xxx
> Jul 28 23:00:29 ph4 kernel: [drm] GPU post is not needed
> Jul 28 23:00:29 ph4 kernel: [drm] Changing default dispclk from 600Mhz to
> 625Mhz
> Jul 28 23:00:29 ph4 kernel: [drm] vm size is 64 GB, block size is 13-bit
> Jul 28 23:00:29 ph4 kernel: amdgpu 0000:01:00.0: VRAM: 2048M
> 0x000000F400000000 - 0x000000F47FFFFFFF (2048M used)
> Jul 28 23:00:29 ph4 kernel: amdgpu 0000:01:00.0: GTT: 256M
> 0x0000000000000000 - 0x000000000FFFFFFF
> Jul 28 23:00:29 ph4 kernel: [drm] Detected VRAM RAM=2048M, BAR=256M
> Jul 28 23:00:29 ph4 kernel: [drm] RAM width 256bits GDDR5
> Jul 28 23:00:29 ph4 kernel: [TTM] Zone kernel: Available graphics memory:
> 4069418 kiB
> Jul 28 23:00:29 ph4 kernel: [TTM] Zone dma32: Available graphics memory:
> 2097152 kiB
> Jul 28 23:00:29 ph4 kernel: [TTM] Initializing pool allocator
> Jul 28 23:00:29 ph4 kernel: [TTM] Initializing DMA pool allocator
> Jul 28 23:00:29 ph4 kernel: [drm] amdgpu: 2048M of VRAM memory ready
> Jul 28 23:00:29 ph4 kernel: [drm] amdgpu: 3072M of GTT memory ready.
> Jul 28 23:00:29 ph4 kernel: [drm] GART: num cpu pages 65536, num gpu pages
> 65536
> Jul 28 23:00:29 ph4 kernel: [drm] PCIE GART of 256M enabled (table at
> 0x000000F400040000).
> Jul 28 23:00:29 ph4 kernel: [drm] Supports vblank timestamp caching Rev 2
> (21.10.2013).
> Jul 28 23:00:29 ph4 kernel: [drm] Driver supports precise vblank timestamp
> query.
> Jul 28 23:00:29 ph4 kernel: amdgpu 0000:01:00.0: amdgpu: using MSI.
> Jul 28 23:00:29 ph4 kernel: [drm] amdgpu: irq initialized.
> Jul 28 23:00:29 ph4 kernel: amdgpu: [powerplay] amdgpu: powerplay sw
> initialized
> Jul 28 23:00:29 ph4 kernel: [drm] AMDGPU Display Connectors
> Jul 28 23:00:29 ph4 kernel: [drm] Connector 0:
> Jul 28 23:00:29 ph4 kernel: [drm] DP-1
> Jul 28 23:00:29 ph4 kernel: [drm] HPD4
> Jul 28 23:00:29 ph4 kernel: [drm] DDC: 0x4868 0x4868 0x4869 0x4869 0x486a
> 0x486a 0x486b 0x486b
> Jul 28 23:00:29 ph4 kernel: [drm] Encoders:
> Jul 28 23:00:29 ph4 kernel: [drm] DFP1: INTERNAL_UNIPHY1
> Jul 28 23:00:29 ph4 kernel: [drm] Connector 1:
> Jul 28 23:00:29 ph4 kernel: [drm] HDMI-A-1
> Jul 28 23:00:29 ph4 kernel: [drm] HPD5
> Jul 28 23:00:29 ph4 kernel: [drm] DDC: 0x4870 0x4870 0x4871 0x4871 0x4872
> 0x4872 0x4873 0x4873
> Jul 28 23:00:29 ph4 kernel: [drm] Encoders:
> Jul 28 23:00:29 ph4 kernel: [drm] DFP2: INTERNAL_UNIPHY1
> Jul 28 23:00:29 ph4 kernel: [drm] Connector 2:
> Jul 28 23:00:29 ph4 kernel: [drm] DVI-D-1
> Jul 28 23:00:29 ph4 kernel: [drm] HPD1
> Jul 28 23:00:29 ph4 kernel: [drm] DDC: 0x4878 0x4878 0x4879 0x4879 0x487a
> 0x487a 0x487b 0x487b
> Jul 28 23:00:29 ph4 kernel: [drm] Encoders:
> Jul 28 23:00:29 ph4 kernel: [drm] DFP3: INTERNAL_UNIPHY
> Jul 28 23:00:29 ph4 kernel: [drm] Connector 3:
> Jul 28 23:00:29 ph4 kernel: [drm] DVI-I-1
> Jul 28 23:00:29 ph4 kernel: [drm] HPD6
> Jul 28 23:00:29 ph4 kernel: [drm] DDC: 0x487c 0x487c 0x487d 0x487d 0x487e
> 0x487e 0x487f 0x487f
> Jul 28 23:00:29 ph4 kernel: [drm] Encoders:
> Jul 28 23:00:29 ph4 kernel: [drm] DFP4: INTERNAL_UNIPHY2
> Jul 28 23:00:29 ph4 kernel: [drm] CRT1: INTERNAL_KLDSCP_DAC1
> Jul 28 23:00:29 ph4 kernel: amdgpu 0000:01:00.0: fence driver on ring 0 use
> gpu addr 0x0000000000400200, cpu addr 0xffff88022e059200
> Jul 28 23:00:29 ph4 kernel: amdgpu 0000:01:00.0: fence driver on ring 1 use
> gpu addr 0x0000000000400600, cpu addr 0xffff88022e059600
> Jul 28 23:00:29 ph4 kernel: amdgpu 0000:01:00.0: fence driver on ring 2 use
> gpu addr 0x0000000000400a00, cpu addr 0xffff88022e059a00
> Jul 28 23:00:29 ph4 kernel: amdgpu 0000:01:00.0: fence driver on ring 3 use
> gpu addr 0x0000000000400e00, cpu addr 0xffff88022e059e00
> Jul 28 23:00:29 ph4 kernel: amdgpu 0000:01:00.0: (-22) ring rptr_offs wb
> alloc failed
> Jul 28 23:00:29 ph4 kernel: [drm:amdgpu_device_init [amdgpu]] *ERROR*
> sw_init of IP block <gfx_v8_0> failed -22
> Jul 28 23:00:29 ph4 kernel: amdgpu 0000:01:00.0: amdgpu_init failed
> Jul 28 23:00:29 ph4 kernel: [TTM] Finalizing pool allocator
> Jul 28 23:00:29 ph4 kernel: [TTM] Finalizing DMA pool allocator
> Jul 28 23:00:29 ph4 kernel: [TTM] Zone kernel: Used memory at exit: 73 kiB
> Jul 28 23:00:29 ph4 kernel: [TTM] Zone dma32: Used memory at exit: 25 kiB
> Jul 28 23:00:29 ph4 kernel: [drm] amdgpu: ttm finalized
> Jul 28 23:00:29 ph4 kernel: amdgpu 0000:01:00.0: Fatal error during GPU init
> Jul 28 23:00:29 ph4 kernel: [drm] amdgpu: finishing device.
> Jul 28 23:00:29 ph4 kernel: [TTM] Memory type 2 has not been initialized
> Jul 28 23:00:29 ph4 kernel: amdgpu: probe of 0000:01:00.0 failed with error
> -22
>
>
>
>>
>> Signed-off-by: Alex Deucher <alexander.deucher-5C7GfCeVMHo@public.gmane.org>
>> ---
>> drivers/gpu/drm/amd/amdgpu/amdgpu.h | 4 --
>> drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 65
>> ------------------------------
>> drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 65
>> ++++++++----------------------
>> drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 8 ++--
>> 4 files changed, 20 insertions(+), 122 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
>> b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
>> index ed1b688..c880851 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
>> @@ -1190,10 +1190,6 @@ struct amdgpu_wb {
>> int amdgpu_wb_get(struct amdgpu_device *adev, u32 *wb);
>> void amdgpu_wb_free(struct amdgpu_device *adev, u32 wb);
>> -int amdgpu_wb_get_64bit(struct amdgpu_device *adev, u32 *wb);
>> -int amdgpu_wb_get_256bit(struct amdgpu_device *adev, u32 *wb);
>> -void amdgpu_wb_free_64bit(struct amdgpu_device *adev, u32 wb);
>> -void amdgpu_wb_free_256bit(struct amdgpu_device *adev, u32 wb);
>> void amdgpu_get_pcie_info(struct amdgpu_device *adev);
>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
>> index c2ddeb1..d422277 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
>> @@ -570,41 +570,6 @@ static int amdgpu_wb_init(struct amdgpu_device *adev)
>> */
>> int amdgpu_wb_get(struct amdgpu_device *adev, u32 *wb)
>> {
>> - unsigned long offset = find_first_zero_bit(adev->wb.used,
>> adev->wb.num_wb);
>> - if (offset < adev->wb.num_wb) {
>> - __set_bit(offset, adev->wb.used);
>> - *wb = offset;
>> - return 0;
>> - } else {
>> - return -EINVAL;
>> - }
>> -}
>> -
>> -/**
>> - * amdgpu_wb_get_64bit - Allocate a wb entry
>> - *
>> - * @adev: amdgpu_device pointer
>> - * @wb: wb index
>> - *
>> - * Allocate a wb slot for use by the driver (all asics).
>> - * Returns 0 on success or -EINVAL on failure.
>> - */
>> -int amdgpu_wb_get_64bit(struct amdgpu_device *adev, u32 *wb)
>> -{
>> - unsigned long offset =
>> bitmap_find_next_zero_area_off(adev->wb.used,
>> - adev->wb.num_wb, 0, 2, 7, 0);
>> - if ((offset + 1) < adev->wb.num_wb) {
>> - __set_bit(offset, adev->wb.used);
>> - __set_bit(offset + 1, adev->wb.used);
>> - *wb = offset;
>> - return 0;
>> - } else {
>> - return -EINVAL;
>> - }
>> -}
>> -
>> -int amdgpu_wb_get_256bit(struct amdgpu_device *adev, u32 *wb)
>> -{
>> int i = 0;
>> unsigned long offset =
>> bitmap_find_next_zero_area_off(adev->wb.used,
>> adev->wb.num_wb, 0, 8, 63, 0);
>> @@ -628,36 +593,6 @@ int amdgpu_wb_get_256bit(struct amdgpu_device *adev,
>> u32 *wb)
>> */
>> void amdgpu_wb_free(struct amdgpu_device *adev, u32 wb)
>> {
>> - if (wb < adev->wb.num_wb)
>> - __clear_bit(wb, adev->wb.used);
>> -}
>> -
>> -/**
>> - * amdgpu_wb_free_64bit - Free a wb entry
>> - *
>> - * @adev: amdgpu_device pointer
>> - * @wb: wb index
>> - *
>> - * Free a wb slot allocated for use by the driver (all asics)
>> - */
>> -void amdgpu_wb_free_64bit(struct amdgpu_device *adev, u32 wb)
>> -{
>> - if ((wb + 1) < adev->wb.num_wb) {
>> - __clear_bit(wb, adev->wb.used);
>> - __clear_bit(wb + 1, adev->wb.used);
>> - }
>> -}
>> -
>> -/**
>> - * amdgpu_wb_free_256bit - Free a wb entry
>> - *
>> - * @adev: amdgpu_device pointer
>> - * @wb: wb index
>> - *
>> - * Free a wb slot allocated for use by the driver (all asics)
>> - */
>> -void amdgpu_wb_free_256bit(struct amdgpu_device *adev, u32 wb)
>> -{
>> int i = 0;
>> if ((wb + 7) < adev->wb.num_wb)
>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
>> index 3874be8..704475674 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c
>> @@ -184,47 +184,22 @@ int amdgpu_ring_init(struct amdgpu_device *adev,
>> struct amdgpu_ring *ring,
>> return r;
>> }
>> - if (ring->funcs->support_64bit_ptrs) {
>> - r = amdgpu_wb_get_64bit(adev, &ring->rptr_offs);
>> - if (r) {
>> - dev_err(adev->dev, "(%d) ring rptr_offs wb alloc
>> failed\n", r);
>> - return r;
>> - }
>> -
>> - r = amdgpu_wb_get_64bit(adev, &ring->wptr_offs);
>> - if (r) {
>> - dev_err(adev->dev, "(%d) ring wptr_offs wb alloc
>> failed\n", r);
>> - return r;
>> - }
>> -
>> - } else {
>> - r = amdgpu_wb_get(adev, &ring->rptr_offs);
>> - if (r) {
>> - dev_err(adev->dev, "(%d) ring rptr_offs wb alloc
>> failed\n", r);
>> - return r;
>> - }
>> -
>> - r = amdgpu_wb_get(adev, &ring->wptr_offs);
>> - if (r) {
>> - dev_err(adev->dev, "(%d) ring wptr_offs wb alloc
>> failed\n", r);
>> - return r;
>> - }
>> -
>> + r = amdgpu_wb_get(adev, &ring->rptr_offs);
>> + if (r) {
>> + dev_err(adev->dev, "(%d) ring rptr_offs wb alloc
>> failed\n", r);
>> + return r;
>> }
>> - if (amdgpu_sriov_vf(adev) && ring->funcs->type ==
>> AMDGPU_RING_TYPE_GFX) {
>> - r = amdgpu_wb_get_256bit(adev, &ring->fence_offs);
>> - if (r) {
>> - dev_err(adev->dev, "(%d) ring fence_offs wb alloc
>> failed\n", r);
>> - return r;
>> - }
>> + r = amdgpu_wb_get(adev, &ring->wptr_offs);
>> + if (r) {
>> + dev_err(adev->dev, "(%d) ring wptr_offs wb alloc
>> failed\n", r);
>> + return r;
>> + }
>> - } else {
>> - r = amdgpu_wb_get(adev, &ring->fence_offs);
>> - if (r) {
>> - dev_err(adev->dev, "(%d) ring fence_offs wb alloc
>> failed\n", r);
>> - return r;
>> - }
>> + r = amdgpu_wb_get(adev, &ring->fence_offs);
>> + if (r) {
>> + dev_err(adev->dev, "(%d) ring fence_offs wb alloc
>> failed\n", r);
>> + return r;
>> }
>> r = amdgpu_wb_get(adev, &ring->cond_exe_offs);
>> @@ -286,19 +261,11 @@ void amdgpu_ring_fini(struct amdgpu_ring *ring)
>> {
>> ring->ready = false;
>> - if (ring->funcs->support_64bit_ptrs) {
>> - amdgpu_wb_free_64bit(ring->adev, ring->rptr_offs);
>> - amdgpu_wb_free_64bit(ring->adev, ring->wptr_offs);
>> - } else {
>> - amdgpu_wb_free(ring->adev, ring->rptr_offs);
>> - amdgpu_wb_free(ring->adev, ring->wptr_offs);
>> - }
>> + amdgpu_wb_free(ring->adev, ring->rptr_offs);
>> + amdgpu_wb_free(ring->adev, ring->wptr_offs);
>> amdgpu_wb_free(ring->adev, ring->cond_exe_offs);
>> - if (amdgpu_sriov_vf(ring->adev) && ring->funcs->type ==
>> AMDGPU_RING_TYPE_GFX)
>> - amdgpu_wb_free_256bit(ring->adev, ring->fence_offs);
>> - else
>> - amdgpu_wb_free(ring->adev, ring->fence_offs);
>> + amdgpu_wb_free(ring->adev, ring->fence_offs);
>> amdgpu_bo_free_kernel(&ring->ring_obj,
>> &ring->gpu_addr,
>> diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
>> b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
>> index 5c24708..8273e63 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
>> @@ -1278,8 +1278,8 @@ static int sdma_v4_0_sw_init(void *handle)
>> AMDGPU_SDMA_IRQ_TRAP1);
>> if (amdgpu_sriov_vf(adev)) {
>> - r = amdgpu_wb_get_64bit(adev,
>> -
>> &adev->sdma.instance[i].poll_mem_offs);
>> + r = amdgpu_wb_get(adev,
>> +
>> &adev->sdma.instance[i].poll_mem_offs);
>> if (r) {
>> dev_err(adev->dev, "(%d) failed to
>> allocate SDMA poll mem wb.\n", r);
>> return r;
>> @@ -1301,8 +1301,8 @@ static int sdma_v4_0_sw_fini(void *handle)
>> amdgpu_ring_fini(&adev->sdma.instance[i].ring);
>> if (amdgpu_sriov_vf(adev))
>> - amdgpu_wb_free_64bit(adev,
>> -
>> adev->sdma.instance[i].poll_mem_offs);
>> + amdgpu_wb_free(adev,
>> +
>> adev->sdma.instance[i].poll_mem_offs);
>> }
>> return 0;
>> }
>>
>
[-- Attachment #2: 0001-drm-amdgpu-bump-AMDGPU_MAX_WB.patch --]
[-- Type: text/x-diff, Size: 952 bytes --]
From 8094cec71ba3da07617ff08e5c392c78da70d7d1 Mon Sep 17 00:00:00 2001
From: Alex Deucher <alexander.deucher@amd.com>
Date: Fri, 28 Jul 2017 18:13:42 -0400
Subject: [PATCH] drm/amdgpu: bump AMDGPU_MAX_WB
Since we always use 256bit wb slots now.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index 68b3023..d001262d 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -1118,7 +1118,7 @@ static inline void amdgpu_set_ib_value(struct amdgpu_cs_parser *p,
/*
* Writeback
*/
-#define AMDGPU_MAX_WB 1024 /* Reserve at most 1024 WB slots for amdgpu-owned rings. */
+#define AMDGPU_MAX_WB 16384 /* Reserve at most 16384 WB slots for amdgpu-owned rings. */
struct amdgpu_wb {
struct amdgpu_bo *wb_obj;
--
2.5.5
[-- Attachment #3: Type: text/plain, Size: 154 bytes --]
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] drm/amdgpu: use 256 bit buffers for all wb allocations
[not found] ` <CADnq5_PumnBBWeb0j2KyxSURtizKrMUrY4FWH1TKn4wX9L+Gxw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
@ 2017-07-28 22:34 ` Andy Furniss
0 siblings, 0 replies; 5+ messages in thread
From: Andy Furniss @ 2017-07-28 22:34 UTC (permalink / raw)
To: Alex Deucher; +Cc: Alex Deucher, amd-gfx list
Alex Deucher wrote:
> On Fri, Jul 28, 2017 at 6:08 PM, Andy Furniss <adf.lists@gmail.com> wrote:
>> Alex Deucher wrote:
>>>
>>> May waste a bit of memory, but simplifies the interface
>>> significantly.
>>
>>
>> Can't boot tonga with this (testing 4.14-wip)
>
> Should be fixed with this patch.
Yes, OK with that, thanks.
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-07-28 22:34 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-07-28 16:15 [PATCH] drm/amdgpu: use 256 bit buffers for all wb allocations Alex Deucher
[not found] ` <1501258540-9950-1-git-send-email-alexander.deucher-5C7GfCeVMHo@public.gmane.org>
2017-07-28 18:10 ` Christian König
2017-07-28 22:08 ` Andy Furniss
[not found] ` <b589c629-dc1e-0cd4-80e5-aa6b1aa910ab-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2017-07-28 22:15 ` Alex Deucher
[not found] ` <CADnq5_PumnBBWeb0j2KyxSURtizKrMUrY4FWH1TKn4wX9L+Gxw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2017-07-28 22:34 ` Andy Furniss
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.