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 at 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 <evan.quan at amd.com>
> ---
> 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);
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/amd-gfx/attachments/20180821/c660a5f2/attachment.html>
