RE: [PATCH 3/7] drm/amdgpu: Vega12 doorbell index initialization

["Zeng, Oak" <Oak.Zeng-5C7GfCeVMHo@public.gmane.org>]

Hi Alex/Felix/Emily,

Sometime back this year Emily put a change for Vega10 to use different SDMA doorbells, to accommodate host driver settings for vega10 sriov . That change wasn't applied to vega12/raven. I received comment from Felix saying that we shouldn't change the doorbell layout for ASICs on the market. This is why I used different doorbells b/t vega10 and vega12. I think in this case, maybe vega12 also have the same sriov requirement. If you all agree, I will use vega10 doorbells for vega12 and raven. Please confirm.  

	/* sDMA engines  reserved from 0xe0 -0xef  */
	AMDGPU_DOORBELL64_sDMA_ENGINE0            = 0xE0,
	AMDGPU_DOORBELL64_sDMA_HI_PRI_ENGINE0     = 0xE1,
	AMDGPU_DOORBELL64_sDMA_ENGINE1            = 0xE8,
	AMDGPU_DOORBELL64_sDMA_HI_PRI_ENGINE1     = 0xE9,

	/* For vega10 sriov, the sdma doorbell must be fixed as follow
	 * to keep the same setting with host driver, or it will
	 * happen conflicts
	 */
	AMDGPU_VEGA10_DOORBELL64_sDMA_ENGINE0            = 0xF0,
	AMDGPU_VEGA10_DOORBELL64_sDMA_HI_PRI_ENGINE0     = 0xF1,
	AMDGPU_VEGA10_DOORBELL64_sDMA_ENGINE1            = 0xF2,
	AMDGPU_VEGA10_DOORBELL64_sDMA_HI_PRI_ENGINE1     = 0xF3,

thanks,
Oak

-----Original Message-----
From: Alex Deucher <alexdeucher@gmail.com> 
Sent: Sunday, November 25, 2018 1:42 PM
To: Zeng, Oak <Oak.Zeng@amd.com>
Subject: Fwd: [PATCH 3/7] drm/amdgpu: Vega12 doorbell index initialization

---------- Forwarded message ---------
From: Alex Deucher <alexdeucher@gmail.com>
Date: Wed, Nov 21, 2018 at 11:16 AM
Subject: Re: [PATCH 3/7] drm/amdgpu: Vega12 doorbell index initialization
To: <ozeng@amd.com>
Cc: amd-gfx list <amd-gfx@lists.freedesktop.org>, Oak Zeng <Oak.Zeng@amd.com>


On Wed, Nov 21, 2018 at 10:52 AM Oak Zeng <ozeng@amd.com> wrote:
>
> Change-Id: Ib2c570224321bb7002d2ed01f43ac70203e86f88
> Signed-off-by: Oak Zeng <ozeng@amd.com>
> Suggested-by: Felix Kuehling <Felix.Kuehling@amd.com>
> Suggested-by: Alex Deucher <alexander.deucher@amd.com>
> ---
>  drivers/gpu/drm/amd/amdgpu/Makefile                |  2 +-
>  drivers/gpu/drm/amd/amdgpu/soc15.h                 |  1 +
>  .../drm/amd/amdgpu/vega12_doorbell_index_init.c    | 54 ++++++++++++++++++++++
>  3 files changed, 56 insertions(+), 1 deletion(-)  create mode 100644 
> drivers/gpu/drm/amd/amdgpu/vega12_doorbell_index_init.c
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/Makefile 
> b/drivers/gpu/drm/amd/amdgpu/Makefile
> index 61cea57..96a4e1c 100644
> --- a/drivers/gpu/drm/amd/amdgpu/Makefile
> +++ b/drivers/gpu/drm/amd/amdgpu/Makefile
> @@ -63,7 +63,7 @@ amdgpu-$(CONFIG_DRM_AMDGPU_SI)+= si.o gmc_v6_0.o 
> gfx_v6_0.o si_ih.o si_dma.o dce
>
>  amdgpu-y += \
>         vi.o mxgpu_vi.o nbio_v6_1.o soc15.o emu_soc.o mxgpu_ai.o nbio_v7_0.o vega10_reg_init.o \
> -       vega20_reg_init.o nbio_v7_4.o vega10_doorbell_index_init.o
> +       vega20_reg_init.o nbio_v7_4.o vega10_doorbell_index_init.o 
> + vega12_doorbell_index_init.o
>
>  # add DF block
>  amdgpu-y += \
> diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.h 
> b/drivers/gpu/drm/amd/amdgpu/soc15.h
> index d37c57d..939c0e8 100644
> --- a/drivers/gpu/drm/amd/amdgpu/soc15.h
> +++ b/drivers/gpu/drm/amd/amdgpu/soc15.h
> @@ -59,4 +59,5 @@ int vega10_reg_base_init(struct amdgpu_device 
> *adev);  int vega20_reg_base_init(struct amdgpu_device *adev);
>
>  void vega10_doorbell_index_init(struct amdgpu_device *adev);
> +void vega12_doorbell_index_init(struct amdgpu_device *adev);
>  #endif
> diff --git a/drivers/gpu/drm/amd/amdgpu/vega12_doorbell_index_init.c 
> b/drivers/gpu/drm/amd/amdgpu/vega12_doorbell_index_init.c
> new file mode 100644
> index 0000000..43be474
> --- /dev/null
> +++ b/drivers/gpu/drm/amd/amdgpu/vega12_doorbell_index_init.c
> @@ -0,0 +1,54 @@
> +/*
> + * Copyright 2018 Advanced Micro Devices, Inc.
> + *
> + * Permission is hereby granted, free of charge, to any person 
> +obtaining a
> + * copy of this software and associated documentation files (the 
> +"Software"),
> + * to deal in the Software without restriction, including without 
> +limitation
> + * the rights to use, copy, modify, merge, publish, distribute, 
> +sublicense,
> + * and/or sell copies of the Software, and to permit persons to whom 
> +the
> + * Software is furnished to do so, subject to the following conditions:
> + *
> + * The above copyright notice and this permission notice shall be 
> +included in
> + * all copies or substantial portions of the Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
> +EXPRESS OR
> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 
> +MERCHANTABILITY,
> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT 
> +SHALL
> + * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, 
> +DAMAGES OR
> + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR 
> +OTHERWISE,
> + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE 
> +OR
> + * OTHER DEALINGS IN THE SOFTWARE.
> + *
> + */
> +
> +#include "amdgpu.h"
> +
> +void vega12_doorbell_index_init(struct amdgpu_device *adev) {
> +       adev->doorbell_index.kiq = 0x00;
> +       adev->doorbell_index.mec_ring0 = 0x03;
> +       adev->doorbell_index.mec_ring1 = 0x04;
> +       adev->doorbell_index.mec_ring2 = 0x05;
> +       adev->doorbell_index.mec_ring3 = 0x06;
> +       adev->doorbell_index.mec_ring4 = 0x07;
> +       adev->doorbell_index.mec_ring5 = 0x08;
> +       adev->doorbell_index.mec_ring6 = 0x09;
> +       adev->doorbell_index.mec_ring7 = 0x0a;
> +       adev->doorbell_index.userqueue_start = 0x0b;
> +       adev->doorbell_index.userqueue_end = 0x8a;
> +       adev->doorbell_index.gfx_ring0 = 0x8b;
> +       adev->doorbell_index.sdma_engine0 = 0xe0;
> +       adev->doorbell_index.sdma_engine1 = 0xe8;
> +       adev->doorbell_index.ih = 0xf4;
> +       adev->doorbell_index.uvd_vce.uvd_ring0_1 = 0xf8;
> +       adev->doorbell_index.uvd_vce.uvd_ring2_3 = 0xf9;
> +       adev->doorbell_index.uvd_vce.uvd_ring4_5 = 0xfa;
> +       adev->doorbell_index.uvd_vce.uvd_ring6_7 = 0xfb;
> +       adev->doorbell_index.uvd_vce.vce_ring0_1 = 0xfc;
> +       adev->doorbell_index.uvd_vce.vce_ring2_3 = 0xfd;
> +       adev->doorbell_index.uvd_vce.vce_ring4_5 = 0xfe;
> +       adev->doorbell_index.uvd_vce.vce_ring6_7 = 0xff;
> +       /* In unit of dword doorbell */
> +       adev->doorbell_index.max_assignment = 0xff << 1; }

You can drop this patch.  Just use the vega10 one for vega12.  It's the same.

Alex

> +
> --
> 2.7.4
>
> _______________________________________________
> 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