Re: [PATCH] drm/amdgpu: fix sdma doorbell range setting

2018-08-21 Thread Deucher, Alexander 
Yes, this is for amd-staging-drm-next and ultimately upstream.


Alex


From: Kuehling, Felix
Sent: Tuesday, August 21, 2018 4:10:07 PM
To: Quan, Evan; amd-gfx@lists.freedesktop.org; Russell, Kent
Cc: Deucher, Alexander; Zhang, Hawking
Subject: Re: [PATCH] drm/amdgpu: fix sdma doorbell range setting

[+Kent]

Which branch is this for?

amd-staging-drm-next doesn't have Shaoyun's other changes for changing
the doorbell layout, so this change looks reasonable for
amd-staging-drm-next.

Kent, we should not merge this change into amd-kfd-staging, because it
would break KFD's 8 SDMA queues per engine. I'm preparing upstreaming
Vega20 changes KFD. That will include reverting this commit.

Regards,
  Felix

On 2018-08-21 04:21 AM, Evan Quan wrote:
> Use the old doorbell range setting until the driver is
> able to support more sdma queues.
>
> Change-Id: I80fc067fc64878d3c7dc3d38bbe1c6c94bec397f
> Signed-off-by: Evan Quan 
> ---
>  drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c 
> b/drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c
> index 89ea92075b6b..2e65447637c6 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, 8);
> + doorbell_range = REG_SET_FIELD(doorbell_range, 
> BIF_SDMA0_DOORBELL_RANGE, SIZE, 2);
>} else
>doorbell_range = REG_SET_FIELD(doorbell_range, 
> BIF_SDMA0_DOORBELL_RANGE, SIZE, 0);
>

___
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Re: [PATCH] drm/amdgpu: fix sdma doorbell range setting

2018-08-21 Thread Felix Kuehling 
[+Kent]

Which branch is this for?

amd-staging-drm-next doesn't have Shaoyun's other changes for changing
the doorbell layout, so this change looks reasonable for
amd-staging-drm-next.

Kent, we should not merge this change into amd-kfd-staging, because it
would break KFD's 8 SDMA queues per engine. I'm preparing upstreaming
Vega20 changes KFD. That will include reverting this commit.

Regards,
  Felix

On 2018-08-21 04:21 AM, Evan Quan wrote:
> Use the old doorbell range setting until the driver is
> able to support more sdma queues.
>
> Change-Id: I80fc067fc64878d3c7dc3d38bbe1c6c94bec397f
> Signed-off-by: Evan Quan 
> ---
>  drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c 
> b/drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c
> index 89ea92075b6b..2e65447637c6 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, 8);
> + doorbell_range = REG_SET_FIELD(doorbell_range, 
> BIF_SDMA0_DOORBELL_RANGE, SIZE, 2);
>   } else
>   doorbell_range = REG_SET_FIELD(doorbell_range, 
> BIF_SDMA0_DOORBELL_RANGE, SIZE, 0);
>  

___
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Re: [PATCH] drm/amdgpu: fix sdma doorbell range setting

2018-08-21 Thread Deucher, Alexander 
Alternatively, we could cherry-pick the change to the doorbell ranges from 
Shaoyun.  Might also be useful to leave a comment here about the doorbell range 
for vega20 sdma.


Alex


From: Zhang, Hawking
Sent: Tuesday, August 21, 2018 5:02:24 AM
To: Quan, Evan; amd-gfx@lists.freedesktop.org
Cc: Deucher, Alexander; Quan, Evan
Subject: RE: [PATCH] drm/amdgpu: fix sdma doorbell range setting

Reviewed-by: Hawking Zhang 

Regards,
Hawking
-Original Message-
From: amd-gfx  On Behalf Of Evan Quan
Sent: 2018年8月21日 16:21
To: amd-gfx@lists.freedesktop.org
Cc: Deucher, Alexander ; Quan, Evan 
; Zhang, Hawking 
Subject: [PATCH] drm/amdgpu: fix sdma doorbell range setting

Use the old doorbell range setting until the driver is able to support more 
sdma queues.

Change-Id: I80fc067fc64878d3c7dc3d38bbe1c6c94bec397f
Signed-off-by: Evan Quan 
---
 drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c 
b/drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c
index 89ea92075b6b..2e65447637c6 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, 8);
+   doorbell_range = REG_SET_FIELD(doorbell_range,
+BIF_SDMA0_DOORBELL_RANGE, SIZE, 2);
 } else
 doorbell_range = REG_SET_FIELD(doorbell_range, 
BIF_SDMA0_DOORBELL_RANGE, SIZE, 0);

--
2.18.0

___
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

RE: [PATCH] drm/amdgpu: fix sdma doorbell range setting

2018-08-21 Thread Zhang, Hawking 
Reviewed-by: Hawking Zhang 

Regards,
Hawking
-Original Message-
From: amd-gfx  On Behalf Of Evan Quan
Sent: 2018年8月21日 16:21
To: amd-gfx@lists.freedesktop.org
Cc: Deucher, Alexander ; Quan, Evan 
; Zhang, Hawking 
Subject: [PATCH] drm/amdgpu: fix sdma doorbell range setting

Use the old doorbell range setting until the driver is able to support more 
sdma queues.

Change-Id: I80fc067fc64878d3c7dc3d38bbe1c6c94bec397f
Signed-off-by: Evan Quan 
---
 drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c 
b/drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c
index 89ea92075b6b..2e65447637c6 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, 8);
+   doorbell_range = REG_SET_FIELD(doorbell_range, 
+BIF_SDMA0_DOORBELL_RANGE, SIZE, 2);
} else
doorbell_range = REG_SET_FIELD(doorbell_range, 
BIF_SDMA0_DOORBELL_RANGE, SIZE, 0);
 
--
2.18.0

___
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