Ok, I can change it legacy_doorbell_index_init(). I will keep this function in vi.c. The reason I don't want to put it in cik.c is cik.c is only compiled optionally.
Another thing I want to know is, my understanding is si doesn't use doorbell, does it?
thanks,
Oak
-----Original Message-----
From: Alex Deucher <alexdeucher@xxxxxxxxx>
Sent: Sunday, November 25, 2018 1:46 PM
To: Zeng, Oak <Oak.Zeng@xxxxxxx>
Subject: Fwd: [PATCH 4/7] drm/amdgpu: Doorbell index initialization for ASICs before vega10
---------- Forwarded message ---------
From: Alex Deucher <alexdeucher@xxxxxxxxx>
Date: Wed, Nov 21, 2018 at 5:40 PM
Subject: Re: [PATCH 4/7] drm/amdgpu: Doorbell index initialization for ASICs before vega10
To: <ozeng@xxxxxxx>
Cc: amd-gfx list <amd-gfx@xxxxxxxxxxxxxxxxxxxxx>, Oak Zeng <Oak.Zeng@xxxxxxx>
On Wed, Nov 21, 2018 at 5:00 PM Oak Zeng <ozeng@xxxxxxx> wrote:
>
> v2: Use enum definition instead of hardcoded number
>
> Change-Id: Id64eb98f5b1c24b51eb2fd5a083086fc3515813d
> Signed-off-by: Oak Zeng <ozeng@xxxxxxx>
> Suggested-by: Felix Kuehling <Felix.Kuehling@xxxxxxx>
> Suggested-by: Alex Deucher <alexander.deucher@xxxxxxx>
Since this covers cik and vi, maybe call it cik_doorbell_index_init() or legacy_doorbell_index_init()?
Alex
> ---
> drivers/gpu/drm/amd/amdgpu/Makefile | 2 +-
> drivers/gpu/drm/amd/amdgpu/vi.h | 2 +-
> drivers/gpu/drm/amd/amdgpu/vi_reg_init.c | 43
> ++++++++++++++++++++++++++++++++
> 3 files changed, 45 insertions(+), 2 deletions(-) create mode 100644
> drivers/gpu/drm/amd/amdgpu/vi_reg_init.c
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/Makefile
> b/drivers/gpu/drm/amd/amdgpu/Makefile
> index 1cef9e1..ae29bf5 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 vega12_reg_init.o
> + vega20_reg_init.o nbio_v7_4.o vega12_reg_init.o vi_reg_init.o
>
> # add DF block
> amdgpu-y += \
> diff --git a/drivers/gpu/drm/amd/amdgpu/vi.h
> b/drivers/gpu/drm/amd/amdgpu/vi.h index 0429fe3..abcb52e 100644
> --- a/drivers/gpu/drm/amd/amdgpu/vi.h
> +++ b/drivers/gpu/drm/amd/amdgpu/vi.h
> @@ -29,5 +29,5 @@
> void vi_srbm_select(struct amdgpu_device *adev,
> u32 me, u32 pipe, u32 queue, u32 vmid); int
> vi_set_ip_blocks(struct amdgpu_device *adev);
> -
> +void vi_doorbell_index_init(struct amdgpu_device *adev);
> #endif
> diff --git a/drivers/gpu/drm/amd/amdgpu/vi_reg_init.c
> b/drivers/gpu/drm/amd/amdgpu/vi_reg_init.c
> new file mode 100644
> index 0000000..cdeb88d
> --- /dev/null
> +++ b/drivers/gpu/drm/amd/amdgpu/vi_reg_init.c
> @@ -0,0 +1,43 @@
> +/*
> + * 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 vi_doorbell_index_init(struct amdgpu_device *adev) {
> + adev->doorbell_index.kiq = AMDGPU_DOORBELL_KIQ;
> + adev->doorbell_index.mec_ring0 = AMDGPU_DOORBELL_MEC_RING0;
> + adev->doorbell_index.mec_ring1 = AMDGPU_DOORBELL_MEC_RING1;
> + adev->doorbell_index.mec_ring2 = AMDGPU_DOORBELL_MEC_RING2;
> + adev->doorbell_index.mec_ring3 = AMDGPU_DOORBELL_MEC_RING3;
> + adev->doorbell_index.mec_ring4 = AMDGPU_DOORBELL_MEC_RING4;
> + adev->doorbell_index.mec_ring5 = AMDGPU_DOORBELL_MEC_RING5;
> + adev->doorbell_index.mec_ring6 = AMDGPU_DOORBELL_MEC_RING6;
> + adev->doorbell_index.mec_ring7 = AMDGPU_DOORBELL_MEC_RING7;
> + adev->doorbell_index.gfx_ring0 = AMDGPU_DOORBELL_GFX_RING0;
> + adev->doorbell_index.sdma_engine0 = AMDGPU_DOORBELL_sDMA_ENGINE0;
> + adev->doorbell_index.sdma_engine1 = AMDGPU_DOORBELL_sDMA_ENGINE1;
> + adev->doorbell_index.ih = AMDGPU_DOORBELL_IH;
> + adev->doorbell_index.max_assignment =
> +AMDGPU_DOORBELL_MAX_ASSIGNMENT; }
> +
> --
> 2.7.4
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@xxxxxxxxxxxxxxxxxxxxx
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
amd-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
