* [PATCH] drm/amdgpu: enable paging queue doorbell support v2
@ 2018-11-15 19:10 Yang, Philip
[not found] ` <20181115190936.19746-1-Philip.Yang-5C7GfCeVMHo@public.gmane.org>
0 siblings, 1 reply; 4+ messages in thread
From: Yang, Philip @ 2018-11-15 19:10 UTC (permalink / raw)
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW; +Cc: Yang, Philip
paging queues doorbell index use existing assignment sDMA_HI_PRI_ENGINE0/1
index, and increase SDMA_DOORBELL_RANGE size from 2 dwords to 4 dwords to
enable the new doorbell index.
v2: disable paging queue doorbell on Vega10 and Vega12 with SRIOV
Change-Id: I9adb965f16ee4089d261d9a22231337739184e49
Signed-off-by: Philip Yang <Philip.Yang@amd.com>
---
drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c | 2 +-
drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 2 +-
drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 26 ++++++++++++++++++--------
3 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c b/drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c
index 6f9c54978cc1..0eb42c29ecac 100644
--- a/drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c
+++ b/drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c
@@ -80,7 +80,7 @@ static void nbio_v6_1_sdma_doorbell_range(struct amdgpu_device *adev, int instan
if (use_doorbell) {
doorbell_range = REG_SET_FIELD(doorbell_range, BIF_SDMA0_DOORBELL_RANGE, OFFSET, doorbell_index);
- doorbell_range = REG_SET_FIELD(doorbell_range, BIF_SDMA0_DOORBELL_RANGE, SIZE, 2);
+ doorbell_range = REG_SET_FIELD(doorbell_range, BIF_SDMA0_DOORBELL_RANGE, SIZE, 4);
} else
doorbell_range = REG_SET_FIELD(doorbell_range, BIF_SDMA0_DOORBELL_RANGE, SIZE, 0);
diff --git a/drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c b/drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c
index f8cee95d61cc..9342ee03d7d4 100644
--- a/drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c
+++ b/drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c
@@ -76,7 +76,7 @@ static void nbio_v7_4_sdma_doorbell_range(struct amdgpu_device *adev, int instan
if (use_doorbell) {
doorbell_range = REG_SET_FIELD(doorbell_range, BIF_SDMA0_DOORBELL_RANGE, OFFSET, doorbell_index);
- doorbell_range = REG_SET_FIELD(doorbell_range, BIF_SDMA0_DOORBELL_RANGE, SIZE, 2);
+ doorbell_range = REG_SET_FIELD(doorbell_range, BIF_SDMA0_DOORBELL_RANGE, SIZE, 4);
} else
doorbell_range = REG_SET_FIELD(doorbell_range, BIF_SDMA0_DOORBELL_RANGE, SIZE, 0);
diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
index f4490cdd9804..1f19f15bb171 100644
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
@@ -925,11 +925,9 @@ static void sdma_v4_0_page_resume(struct amdgpu_device *adev, unsigned int i)
OFFSET, ring->doorbell_index);
WREG32_SDMA(i, mmSDMA0_PAGE_DOORBELL, doorbell);
WREG32_SDMA(i, mmSDMA0_PAGE_DOORBELL_OFFSET, doorbell_offset);
- /* TODO: enable doorbell support */
- /*adev->nbio_funcs->sdma_doorbell_range(adev, i, ring->use_doorbell,
- ring->doorbell_index);*/
- sdma_v4_0_ring_set_wptr(ring);
+ /* paging queue doorbell index is already enabled at sdma_v4_0_gfx_resume */
+ sdma_v4_0_page_ring_set_wptr(ring);
/* set minor_ptr_update to 0 after wptr programed */
WREG32_SDMA(i, mmSDMA0_PAGE_MINOR_PTR_UPDATE, 0);
@@ -1504,9 +1502,6 @@ static int sdma_v4_0_sw_init(void *handle)
ring->ring_obj = NULL;
ring->use_doorbell = true;
- DRM_INFO("use_doorbell being set to: [%s]\n",
- ring->use_doorbell?"true":"false");
-
if (adev->asic_type == CHIP_VEGA10)
ring->doorbell_index = (i == 0) ?
(AMDGPU_VEGA10_DOORBELL64_sDMA_ENGINE0 << 1) //get DWORD offset
@@ -1516,6 +1511,8 @@ static int sdma_v4_0_sw_init(void *handle)
(AMDGPU_DOORBELL64_sDMA_ENGINE0 << 1) //get DWORD offset
: (AMDGPU_DOORBELL64_sDMA_ENGINE1 << 1); // get DWORD offset
+ DRM_DEBUG("use_doorbell being set to: [%s] doorbell index %d\n",
+ ring->use_doorbell?"true":"false", ring->doorbell_index);
sprintf(ring->name, "sdma%d", i);
r = amdgpu_ring_init(adev, ring, 1024,
@@ -1529,7 +1526,20 @@ static int sdma_v4_0_sw_init(void *handle)
if (adev->sdma.has_page_queue) {
ring = &adev->sdma.instance[i].page;
ring->ring_obj = NULL;
- ring->use_doorbell = false;
+ if (!amdgpu_sriov_vf(adev) || adev->asic_type == CHIP_VEGA20)
+ ring->use_doorbell = true;
+
+ if (adev->asic_type == CHIP_VEGA10)
+ ring->doorbell_index = (i == 0) ?
+ (AMDGPU_VEGA10_DOORBELL64_sDMA_HI_PRI_ENGINE0 << 1)
+ : (AMDGPU_VEGA10_DOORBELL64_sDMA_HI_PRI_ENGINE1 << 1);
+ else
+ ring->doorbell_index = (i == 0) ?
+ (AMDGPU_DOORBELL64_sDMA_HI_PRI_ENGINE0 << 1)
+ : (AMDGPU_DOORBELL64_sDMA_HI_PRI_ENGINE1 << 1);
+
+ DRM_DEBUG("paging queue doorbell being set to: [%s] doorbell index %d\n",
+ ring->use_doorbell?"true":"false", ring->doorbell_index);
sprintf(ring->name, "page%d", i);
r = amdgpu_ring_init(adev, ring, 1024,
--
2.17.1
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/amdgpu: enable paging queue doorbell support v2
[not found] ` <20181115190936.19746-1-Philip.Yang-5C7GfCeVMHo@public.gmane.org>
@ 2018-11-19 11:24 ` Christian König
[not found] ` <93f3ef85-337c-e527-dc1e-b54deebe7065-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
0 siblings, 1 reply; 4+ messages in thread
From: Christian König @ 2018-11-19 11:24 UTC (permalink / raw)
To: Yang, Philip, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
Am 15.11.18 um 20:10 schrieb Yang, Philip:
> paging queues doorbell index use existing assignment sDMA_HI_PRI_ENGINE0/1
> index, and increase SDMA_DOORBELL_RANGE size from 2 dwords to 4 dwords to
> enable the new doorbell index.
>
> v2: disable paging queue doorbell on Vega10 and Vega12 with SRIOV
>
> Change-Id: I9adb965f16ee4089d261d9a22231337739184e49
> Signed-off-by: Philip Yang <Philip.Yang@amd.com>
Acked-by: Christian König <christian.koenig@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c | 2 +-
> drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 2 +-
> drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 26 ++++++++++++++++++--------
> 3 files changed, 20 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c b/drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c
> index 6f9c54978cc1..0eb42c29ecac 100644
> --- a/drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c
> +++ b/drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c
> @@ -80,7 +80,7 @@ static void nbio_v6_1_sdma_doorbell_range(struct amdgpu_device *adev, int instan
>
> if (use_doorbell) {
> doorbell_range = REG_SET_FIELD(doorbell_range, BIF_SDMA0_DOORBELL_RANGE, OFFSET, doorbell_index);
> - doorbell_range = REG_SET_FIELD(doorbell_range, BIF_SDMA0_DOORBELL_RANGE, SIZE, 2);
> + doorbell_range = REG_SET_FIELD(doorbell_range, BIF_SDMA0_DOORBELL_RANGE, SIZE, 4);
> } else
> doorbell_range = REG_SET_FIELD(doorbell_range, BIF_SDMA0_DOORBELL_RANGE, SIZE, 0);
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c b/drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c
> index f8cee95d61cc..9342ee03d7d4 100644
> --- a/drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c
> +++ b/drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c
> @@ -76,7 +76,7 @@ static void nbio_v7_4_sdma_doorbell_range(struct amdgpu_device *adev, int instan
>
> if (use_doorbell) {
> doorbell_range = REG_SET_FIELD(doorbell_range, BIF_SDMA0_DOORBELL_RANGE, OFFSET, doorbell_index);
> - doorbell_range = REG_SET_FIELD(doorbell_range, BIF_SDMA0_DOORBELL_RANGE, SIZE, 2);
> + doorbell_range = REG_SET_FIELD(doorbell_range, BIF_SDMA0_DOORBELL_RANGE, SIZE, 4);
> } else
> doorbell_range = REG_SET_FIELD(doorbell_range, BIF_SDMA0_DOORBELL_RANGE, SIZE, 0);
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
> index f4490cdd9804..1f19f15bb171 100644
> --- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
> @@ -925,11 +925,9 @@ static void sdma_v4_0_page_resume(struct amdgpu_device *adev, unsigned int i)
> OFFSET, ring->doorbell_index);
> WREG32_SDMA(i, mmSDMA0_PAGE_DOORBELL, doorbell);
> WREG32_SDMA(i, mmSDMA0_PAGE_DOORBELL_OFFSET, doorbell_offset);
> - /* TODO: enable doorbell support */
> - /*adev->nbio_funcs->sdma_doorbell_range(adev, i, ring->use_doorbell,
> - ring->doorbell_index);*/
>
> - sdma_v4_0_ring_set_wptr(ring);
> + /* paging queue doorbell index is already enabled at sdma_v4_0_gfx_resume */
> + sdma_v4_0_page_ring_set_wptr(ring);
>
> /* set minor_ptr_update to 0 after wptr programed */
> WREG32_SDMA(i, mmSDMA0_PAGE_MINOR_PTR_UPDATE, 0);
> @@ -1504,9 +1502,6 @@ static int sdma_v4_0_sw_init(void *handle)
> ring->ring_obj = NULL;
> ring->use_doorbell = true;
>
> - DRM_INFO("use_doorbell being set to: [%s]\n",
> - ring->use_doorbell?"true":"false");
> -
> if (adev->asic_type == CHIP_VEGA10)
> ring->doorbell_index = (i == 0) ?
> (AMDGPU_VEGA10_DOORBELL64_sDMA_ENGINE0 << 1) //get DWORD offset
> @@ -1516,6 +1511,8 @@ static int sdma_v4_0_sw_init(void *handle)
> (AMDGPU_DOORBELL64_sDMA_ENGINE0 << 1) //get DWORD offset
> : (AMDGPU_DOORBELL64_sDMA_ENGINE1 << 1); // get DWORD offset
>
> + DRM_DEBUG("use_doorbell being set to: [%s] doorbell index %d\n",
> + ring->use_doorbell?"true":"false", ring->doorbell_index);
>
> sprintf(ring->name, "sdma%d", i);
> r = amdgpu_ring_init(adev, ring, 1024,
> @@ -1529,7 +1526,20 @@ static int sdma_v4_0_sw_init(void *handle)
> if (adev->sdma.has_page_queue) {
> ring = &adev->sdma.instance[i].page;
> ring->ring_obj = NULL;
> - ring->use_doorbell = false;
> + if (!amdgpu_sriov_vf(adev) || adev->asic_type == CHIP_VEGA20)
> + ring->use_doorbell = true;
> +
> + if (adev->asic_type == CHIP_VEGA10)
> + ring->doorbell_index = (i == 0) ?
> + (AMDGPU_VEGA10_DOORBELL64_sDMA_HI_PRI_ENGINE0 << 1)
> + : (AMDGPU_VEGA10_DOORBELL64_sDMA_HI_PRI_ENGINE1 << 1);
> + else
> + ring->doorbell_index = (i == 0) ?
> + (AMDGPU_DOORBELL64_sDMA_HI_PRI_ENGINE0 << 1)
> + : (AMDGPU_DOORBELL64_sDMA_HI_PRI_ENGINE1 << 1);
> +
> + DRM_DEBUG("paging queue doorbell being set to: [%s] doorbell index %d\n",
> + ring->use_doorbell?"true":"false", ring->doorbell_index);
>
> sprintf(ring->name, "page%d", i);
> r = amdgpu_ring_init(adev, ring, 1024,
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/amdgpu: enable paging queue doorbell support v2
[not found] ` <93f3ef85-337c-e527-dc1e-b54deebe7065-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
@ 2018-11-19 20:08 ` Kuehling, Felix
[not found] ` <ea885c40-daa4-b3ef-faec-35c826c874aa-5C7GfCeVMHo@public.gmane.org>
0 siblings, 1 reply; 4+ messages in thread
From: Kuehling, Felix @ 2018-11-19 20:08 UTC (permalink / raw)
To: Koenig, Christian, Yang, Philip,
amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
Hi Christian,
On 2018-11-19 6:24 a.m., Christian König wrote:
> Am 15.11.18 um 20:10 schrieb Yang, Philip:
>> paging queues doorbell index use existing assignment
>> sDMA_HI_PRI_ENGINE0/1
>> index, and increase SDMA_DOORBELL_RANGE size from 2 dwords to 4
>> dwords to
>> enable the new doorbell index.
>>
>> v2: disable paging queue doorbell on Vega10 and Vega12 with SRIOV
>>
>> Change-Id: I9adb965f16ee4089d261d9a22231337739184e49
>> Signed-off-by: Philip Yang <Philip.Yang@amd.com>
>
> Acked-by: Christian König <christian.koenig@amd.com>
This change was superseded by "drm/amdgpu: enable paging queue doorbell
support v3", which doesn't need to change the doorbell routing and no
special rules for SRIOV. Instead it uses two pages from the doorbell
aperture. That's OK, because KFD only uses page 2 and up.
Regards,
Felix
>
>> ---
>> drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c | 2 +-
>> drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 2 +-
>> drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 26 ++++++++++++++++++--------
>> 3 files changed, 20 insertions(+), 10 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c
>> b/drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c
>> index 6f9c54978cc1..0eb42c29ecac 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c
>> @@ -80,7 +80,7 @@ static void nbio_v6_1_sdma_doorbell_range(struct
>> amdgpu_device *adev, int instan
>> if (use_doorbell) {
>> doorbell_range = REG_SET_FIELD(doorbell_range,
>> BIF_SDMA0_DOORBELL_RANGE, OFFSET, doorbell_index);
>> - doorbell_range = REG_SET_FIELD(doorbell_range,
>> BIF_SDMA0_DOORBELL_RANGE, SIZE, 2);
>> + doorbell_range = REG_SET_FIELD(doorbell_range,
>> BIF_SDMA0_DOORBELL_RANGE, SIZE, 4);
>> } else
>> doorbell_range = REG_SET_FIELD(doorbell_range,
>> BIF_SDMA0_DOORBELL_RANGE, SIZE, 0);
>> diff --git a/drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c
>> b/drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c
>> index f8cee95d61cc..9342ee03d7d4 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c
>> @@ -76,7 +76,7 @@ static void nbio_v7_4_sdma_doorbell_range(struct
>> amdgpu_device *adev, int instan
>> if (use_doorbell) {
>> doorbell_range = REG_SET_FIELD(doorbell_range,
>> BIF_SDMA0_DOORBELL_RANGE, OFFSET, doorbell_index);
>> - doorbell_range = REG_SET_FIELD(doorbell_range,
>> BIF_SDMA0_DOORBELL_RANGE, SIZE, 2);
>> + doorbell_range = REG_SET_FIELD(doorbell_range,
>> BIF_SDMA0_DOORBELL_RANGE, SIZE, 4);
>> } else
>> doorbell_range = REG_SET_FIELD(doorbell_range,
>> BIF_SDMA0_DOORBELL_RANGE, SIZE, 0);
>> diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
>> b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
>> index f4490cdd9804..1f19f15bb171 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
>> @@ -925,11 +925,9 @@ static void sdma_v4_0_page_resume(struct
>> amdgpu_device *adev, unsigned int i)
>> OFFSET, ring->doorbell_index);
>> WREG32_SDMA(i, mmSDMA0_PAGE_DOORBELL, doorbell);
>> WREG32_SDMA(i, mmSDMA0_PAGE_DOORBELL_OFFSET, doorbell_offset);
>> - /* TODO: enable doorbell support */
>> - /*adev->nbio_funcs->sdma_doorbell_range(adev, i,
>> ring->use_doorbell,
>> - ring->doorbell_index);*/
>> - sdma_v4_0_ring_set_wptr(ring);
>> + /* paging queue doorbell index is already enabled at
>> sdma_v4_0_gfx_resume */
>> + sdma_v4_0_page_ring_set_wptr(ring);
>> /* set minor_ptr_update to 0 after wptr programed */
>> WREG32_SDMA(i, mmSDMA0_PAGE_MINOR_PTR_UPDATE, 0);
>> @@ -1504,9 +1502,6 @@ static int sdma_v4_0_sw_init(void *handle)
>> ring->ring_obj = NULL;
>> ring->use_doorbell = true;
>> - DRM_INFO("use_doorbell being set to: [%s]\n",
>> - ring->use_doorbell?"true":"false");
>> -
>> if (adev->asic_type == CHIP_VEGA10)
>> ring->doorbell_index = (i == 0) ?
>> (AMDGPU_VEGA10_DOORBELL64_sDMA_ENGINE0 << 1) //get
>> DWORD offset
>> @@ -1516,6 +1511,8 @@ static int sdma_v4_0_sw_init(void *handle)
>> (AMDGPU_DOORBELL64_sDMA_ENGINE0 << 1) //get DWORD
>> offset
>> : (AMDGPU_DOORBELL64_sDMA_ENGINE1 << 1); // get
>> DWORD offset
>> + DRM_DEBUG("use_doorbell being set to: [%s] doorbell index
>> %d\n",
>> + ring->use_doorbell?"true":"false", ring->doorbell_index);
>> sprintf(ring->name, "sdma%d", i);
>> r = amdgpu_ring_init(adev, ring, 1024,
>> @@ -1529,7 +1526,20 @@ static int sdma_v4_0_sw_init(void *handle)
>> if (adev->sdma.has_page_queue) {
>> ring = &adev->sdma.instance[i].page;
>> ring->ring_obj = NULL;
>> - ring->use_doorbell = false;
>> + if (!amdgpu_sriov_vf(adev) || adev->asic_type ==
>> CHIP_VEGA20)
>> + ring->use_doorbell = true;
>> +
>> + if (adev->asic_type == CHIP_VEGA10)
>> + ring->doorbell_index = (i == 0) ?
>> + (AMDGPU_VEGA10_DOORBELL64_sDMA_HI_PRI_ENGINE0 << 1)
>> + : (AMDGPU_VEGA10_DOORBELL64_sDMA_HI_PRI_ENGINE1
>> << 1);
>> + else
>> + ring->doorbell_index = (i == 0) ?
>> + (AMDGPU_DOORBELL64_sDMA_HI_PRI_ENGINE0 << 1)
>> + : (AMDGPU_DOORBELL64_sDMA_HI_PRI_ENGINE1 << 1);
>> +
>> + DRM_DEBUG("paging queue doorbell being set to: [%s]
>> doorbell index %d\n",
>> + ring->use_doorbell?"true":"false",
>> ring->doorbell_index);
>> sprintf(ring->name, "page%d", i);
>> r = amdgpu_ring_init(adev, ring, 1024,
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/amdgpu: enable paging queue doorbell support v2
[not found] ` <ea885c40-daa4-b3ef-faec-35c826c874aa-5C7GfCeVMHo@public.gmane.org>
@ 2018-11-20 9:54 ` Christian König
0 siblings, 0 replies; 4+ messages in thread
From: Christian König @ 2018-11-20 9:54 UTC (permalink / raw)
To: Kuehling, Felix, Koenig, Christian, Yang, Philip,
amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
Am 19.11.18 um 21:08 schrieb Kuehling, Felix:
> Hi Christian,
>
> On 2018-11-19 6:24 a.m., Christian König wrote:
>> Am 15.11.18 um 20:10 schrieb Yang, Philip:
>>> paging queues doorbell index use existing assignment
>>> sDMA_HI_PRI_ENGINE0/1
>>> index, and increase SDMA_DOORBELL_RANGE size from 2 dwords to 4
>>> dwords to
>>> enable the new doorbell index.
>>>
>>> v2: disable paging queue doorbell on Vega10 and Vega12 with SRIOV
>>>
>>> Change-Id: I9adb965f16ee4089d261d9a22231337739184e49
>>> Signed-off-by: Philip Yang <Philip.Yang@amd.com>
>> Acked-by: Christian König <christian.koenig@amd.com>
> This change was superseded by "drm/amdgpu: enable paging queue doorbell
> support v3", which doesn't need to change the doorbell routing and no
> special rules for SRIOV. Instead it uses two pages from the doorbell
> aperture. That's OK, because KFD only uses page 2 and up.
Ah, yeah hadn't seen that patch yet.
Thanks,
Christian.
>
> Regards,
> Felix
>
>
>>> ---
>>> drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c | 2 +-
>>> drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 2 +-
>>> drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 26 ++++++++++++++++++--------
>>> 3 files changed, 20 insertions(+), 10 deletions(-)
>>>
>>> diff --git a/drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c
>>> b/drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c
>>> index 6f9c54978cc1..0eb42c29ecac 100644
>>> --- a/drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c
>>> +++ b/drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c
>>> @@ -80,7 +80,7 @@ static void nbio_v6_1_sdma_doorbell_range(struct
>>> amdgpu_device *adev, int instan
>>> if (use_doorbell) {
>>> doorbell_range = REG_SET_FIELD(doorbell_range,
>>> BIF_SDMA0_DOORBELL_RANGE, OFFSET, doorbell_index);
>>> - doorbell_range = REG_SET_FIELD(doorbell_range,
>>> BIF_SDMA0_DOORBELL_RANGE, SIZE, 2);
>>> + doorbell_range = REG_SET_FIELD(doorbell_range,
>>> BIF_SDMA0_DOORBELL_RANGE, SIZE, 4);
>>> } else
>>> doorbell_range = REG_SET_FIELD(doorbell_range,
>>> BIF_SDMA0_DOORBELL_RANGE, SIZE, 0);
>>> diff --git a/drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c
>>> b/drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c
>>> index f8cee95d61cc..9342ee03d7d4 100644
>>> --- a/drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c
>>> +++ b/drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c
>>> @@ -76,7 +76,7 @@ static void nbio_v7_4_sdma_doorbell_range(struct
>>> amdgpu_device *adev, int instan
>>> if (use_doorbell) {
>>> doorbell_range = REG_SET_FIELD(doorbell_range,
>>> BIF_SDMA0_DOORBELL_RANGE, OFFSET, doorbell_index);
>>> - doorbell_range = REG_SET_FIELD(doorbell_range,
>>> BIF_SDMA0_DOORBELL_RANGE, SIZE, 2);
>>> + doorbell_range = REG_SET_FIELD(doorbell_range,
>>> BIF_SDMA0_DOORBELL_RANGE, SIZE, 4);
>>> } else
>>> doorbell_range = REG_SET_FIELD(doorbell_range,
>>> BIF_SDMA0_DOORBELL_RANGE, SIZE, 0);
>>> diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
>>> b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
>>> index f4490cdd9804..1f19f15bb171 100644
>>> --- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
>>> +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
>>> @@ -925,11 +925,9 @@ static void sdma_v4_0_page_resume(struct
>>> amdgpu_device *adev, unsigned int i)
>>> OFFSET, ring->doorbell_index);
>>> WREG32_SDMA(i, mmSDMA0_PAGE_DOORBELL, doorbell);
>>> WREG32_SDMA(i, mmSDMA0_PAGE_DOORBELL_OFFSET, doorbell_offset);
>>> - /* TODO: enable doorbell support */
>>> - /*adev->nbio_funcs->sdma_doorbell_range(adev, i,
>>> ring->use_doorbell,
>>> - ring->doorbell_index);*/
>>> - sdma_v4_0_ring_set_wptr(ring);
>>> + /* paging queue doorbell index is already enabled at
>>> sdma_v4_0_gfx_resume */
>>> + sdma_v4_0_page_ring_set_wptr(ring);
>>> /* set minor_ptr_update to 0 after wptr programed */
>>> WREG32_SDMA(i, mmSDMA0_PAGE_MINOR_PTR_UPDATE, 0);
>>> @@ -1504,9 +1502,6 @@ static int sdma_v4_0_sw_init(void *handle)
>>> ring->ring_obj = NULL;
>>> ring->use_doorbell = true;
>>> - DRM_INFO("use_doorbell being set to: [%s]\n",
>>> - ring->use_doorbell?"true":"false");
>>> -
>>> if (adev->asic_type == CHIP_VEGA10)
>>> ring->doorbell_index = (i == 0) ?
>>> (AMDGPU_VEGA10_DOORBELL64_sDMA_ENGINE0 << 1) //get
>>> DWORD offset
>>> @@ -1516,6 +1511,8 @@ static int sdma_v4_0_sw_init(void *handle)
>>> (AMDGPU_DOORBELL64_sDMA_ENGINE0 << 1) //get DWORD
>>> offset
>>> : (AMDGPU_DOORBELL64_sDMA_ENGINE1 << 1); // get
>>> DWORD offset
>>> + DRM_DEBUG("use_doorbell being set to: [%s] doorbell index
>>> %d\n",
>>> + ring->use_doorbell?"true":"false", ring->doorbell_index);
>>> sprintf(ring->name, "sdma%d", i);
>>> r = amdgpu_ring_init(adev, ring, 1024,
>>> @@ -1529,7 +1526,20 @@ static int sdma_v4_0_sw_init(void *handle)
>>> if (adev->sdma.has_page_queue) {
>>> ring = &adev->sdma.instance[i].page;
>>> ring->ring_obj = NULL;
>>> - ring->use_doorbell = false;
>>> + if (!amdgpu_sriov_vf(adev) || adev->asic_type ==
>>> CHIP_VEGA20)
>>> + ring->use_doorbell = true;
>>> +
>>> + if (adev->asic_type == CHIP_VEGA10)
>>> + ring->doorbell_index = (i == 0) ?
>>> + (AMDGPU_VEGA10_DOORBELL64_sDMA_HI_PRI_ENGINE0 << 1)
>>> + : (AMDGPU_VEGA10_DOORBELL64_sDMA_HI_PRI_ENGINE1
>>> << 1);
>>> + else
>>> + ring->doorbell_index = (i == 0) ?
>>> + (AMDGPU_DOORBELL64_sDMA_HI_PRI_ENGINE0 << 1)
>>> + : (AMDGPU_DOORBELL64_sDMA_HI_PRI_ENGINE1 << 1);
>>> +
>>> + DRM_DEBUG("paging queue doorbell being set to: [%s]
>>> doorbell index %d\n",
>>> + ring->use_doorbell?"true":"false",
>>> ring->doorbell_index);
>>> sprintf(ring->name, "page%d", i);
>>> r = amdgpu_ring_init(adev, ring, 1024,
>> _______________________________________________
>> amd-gfx mailing list
>> amd-gfx@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-11-20 9:54 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-11-15 19:10 [PATCH] drm/amdgpu: enable paging queue doorbell support v2 Yang, Philip
[not found] ` <20181115190936.19746-1-Philip.Yang-5C7GfCeVMHo@public.gmane.org>
2018-11-19 11:24 ` Christian König
[not found] ` <93f3ef85-337c-e527-dc1e-b54deebe7065-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2018-11-19 20:08 ` Kuehling, Felix
[not found] ` <ea885c40-daa4-b3ef-faec-35c826c874aa-5C7GfCeVMHo@public.gmane.org>
2018-11-20 9:54 ` Christian König
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.