From: Huang Rui <ray.huang-5C7GfCeVMHo@public.gmane.org>
To: "Christian König"
<ckoenig.leichtzumerken-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Cc: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org
Subject: Re: [PATCH 2/9] drm/amdgpu: make function pointers mandatory
Date: Tue, 25 Sep 2018 18:03:29 +0800 [thread overview]
Message-ID: <20180925100328.GC30495@hr-amur2> (raw)
In-Reply-To: <20180924123820.1873-2-christian.koenig-5C7GfCeVMHo@public.gmane.org>
On Mon, Sep 24, 2018 at 02:38:13PM +0200, Christian König wrote:
> We always want those to be setup correctly.
>
> Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Huang Rui <ray.huang@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/cik_ih.c | 3 +--
> drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 20 ++++++++------------
> drivers/gpu/drm/amd/amdgpu/cz_ih.c | 3 +--
> drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 3 +--
> drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 3 +--
> drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 3 +--
> drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 3 +--
> drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 3 +--
> drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 3 +--
> drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 3 +--
> drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 3 +--
> drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 3 +--
> drivers/gpu/drm/amd/amdgpu/iceland_ih.c | 3 +--
> drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 20 ++++++++------------
> drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 20 ++++++++------------
> drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 20 ++++++++------------
> drivers/gpu/drm/amd/amdgpu/si_dma.c | 20 ++++++++------------
> drivers/gpu/drm/amd/amdgpu/si_ih.c | 3 +--
> drivers/gpu/drm/amd/amdgpu/tonga_ih.c | 3 +--
> drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 3 +--
> 20 files changed, 55 insertions(+), 90 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/cik_ih.c b/drivers/gpu/drm/amd/amdgpu/cik_ih.c
> index 44d10c2172f6..e75183e09820 100644
> --- a/drivers/gpu/drm/amd/amdgpu/cik_ih.c
> +++ b/drivers/gpu/drm/amd/amdgpu/cik_ih.c
> @@ -468,8 +468,7 @@ static const struct amdgpu_ih_funcs cik_ih_funcs = {
>
> static void cik_ih_set_interrupt_funcs(struct amdgpu_device *adev)
> {
> - if (adev->irq.ih_funcs == NULL)
> - adev->irq.ih_funcs = &cik_ih_funcs;
> + adev->irq.ih_funcs = &cik_ih_funcs;
> }
>
> const struct amdgpu_ip_block_version cik_ih_ip_block =
> diff --git a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
> index 154b1499b07e..ee9d5c92edb1 100644
> --- a/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
> +++ b/drivers/gpu/drm/amd/amdgpu/cik_sdma.c
> @@ -1370,10 +1370,8 @@ static const struct amdgpu_buffer_funcs cik_sdma_buffer_funcs = {
>
> static void cik_sdma_set_buffer_funcs(struct amdgpu_device *adev)
> {
> - if (adev->mman.buffer_funcs == NULL) {
> - adev->mman.buffer_funcs = &cik_sdma_buffer_funcs;
> - adev->mman.buffer_funcs_ring = &adev->sdma.instance[0].ring;
> - }
> + adev->mman.buffer_funcs = &cik_sdma_buffer_funcs;
> + adev->mman.buffer_funcs_ring = &adev->sdma.instance[0].ring;
> }
>
> static const struct amdgpu_vm_pte_funcs cik_sdma_vm_pte_funcs = {
> @@ -1389,15 +1387,13 @@ static void cik_sdma_set_vm_pte_funcs(struct amdgpu_device *adev)
> struct drm_gpu_scheduler *sched;
> unsigned i;
>
> - if (adev->vm_manager.vm_pte_funcs == NULL) {
> - adev->vm_manager.vm_pte_funcs = &cik_sdma_vm_pte_funcs;
> - for (i = 0; i < adev->sdma.num_instances; i++) {
> - sched = &adev->sdma.instance[i].ring.sched;
> - adev->vm_manager.vm_pte_rqs[i] =
> - &sched->sched_rq[DRM_SCHED_PRIORITY_KERNEL];
> - }
> - adev->vm_manager.vm_pte_num_rqs = adev->sdma.num_instances;
> + adev->vm_manager.vm_pte_funcs = &cik_sdma_vm_pte_funcs;
> + for (i = 0; i < adev->sdma.num_instances; i++) {
> + sched = &adev->sdma.instance[i].ring.sched;
> + adev->vm_manager.vm_pte_rqs[i] =
> + &sched->sched_rq[DRM_SCHED_PRIORITY_KERNEL];
> }
> + adev->vm_manager.vm_pte_num_rqs = adev->sdma.num_instances;
> }
>
> const struct amdgpu_ip_block_version cik_sdma_ip_block =
> diff --git a/drivers/gpu/drm/amd/amdgpu/cz_ih.c b/drivers/gpu/drm/amd/amdgpu/cz_ih.c
> index 960c29e17da6..9385da1e1e40 100644
> --- a/drivers/gpu/drm/amd/amdgpu/cz_ih.c
> +++ b/drivers/gpu/drm/amd/amdgpu/cz_ih.c
> @@ -449,8 +449,7 @@ static const struct amdgpu_ih_funcs cz_ih_funcs = {
>
> static void cz_ih_set_interrupt_funcs(struct amdgpu_device *adev)
> {
> - if (adev->irq.ih_funcs == NULL)
> - adev->irq.ih_funcs = &cz_ih_funcs;
> + adev->irq.ih_funcs = &cz_ih_funcs;
> }
>
> const struct amdgpu_ip_block_version cz_ih_ip_block =
> diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
> index 3916aa6cc4ec..89c09c396fe6 100644
> --- a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
> @@ -3570,8 +3570,7 @@ static const struct amdgpu_display_funcs dce_v10_0_display_funcs = {
>
> static void dce_v10_0_set_display_funcs(struct amdgpu_device *adev)
> {
> - if (adev->mode_info.funcs == NULL)
> - adev->mode_info.funcs = &dce_v10_0_display_funcs;
> + adev->mode_info.funcs = &dce_v10_0_display_funcs;
> }
>
> static const struct amdgpu_irq_src_funcs dce_v10_0_crtc_irq_funcs = {
> diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
> index 4ffb612a4e53..cf6faaa05dbb 100644
> --- a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
> @@ -3702,8 +3702,7 @@ static const struct amdgpu_display_funcs dce_v11_0_display_funcs = {
>
> static void dce_v11_0_set_display_funcs(struct amdgpu_device *adev)
> {
> - if (adev->mode_info.funcs == NULL)
> - adev->mode_info.funcs = &dce_v11_0_display_funcs;
> + adev->mode_info.funcs = &dce_v11_0_display_funcs;
> }
>
> static const struct amdgpu_irq_src_funcs dce_v11_0_crtc_irq_funcs = {
> diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
> index 480c5348a14f..371aa05bf537 100644
> --- a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
> @@ -3376,8 +3376,7 @@ static const struct amdgpu_display_funcs dce_v6_0_display_funcs = {
>
> static void dce_v6_0_set_display_funcs(struct amdgpu_device *adev)
> {
> - if (adev->mode_info.funcs == NULL)
> - adev->mode_info.funcs = &dce_v6_0_display_funcs;
> + adev->mode_info.funcs = &dce_v6_0_display_funcs;
> }
>
> static const struct amdgpu_irq_src_funcs dce_v6_0_crtc_irq_funcs = {
> diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
> index 797196476c94..30e76f2407c2 100644
> --- a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
> @@ -3458,8 +3458,7 @@ static const struct amdgpu_display_funcs dce_v8_0_display_funcs = {
>
> static void dce_v8_0_set_display_funcs(struct amdgpu_device *adev)
> {
> - if (adev->mode_info.funcs == NULL)
> - adev->mode_info.funcs = &dce_v8_0_display_funcs;
> + adev->mode_info.funcs = &dce_v8_0_display_funcs;
> }
>
> static const struct amdgpu_irq_src_funcs dce_v8_0_crtc_irq_funcs = {
> diff --git a/drivers/gpu/drm/amd/amdgpu/dce_virtual.c b/drivers/gpu/drm/amd/amdgpu/dce_virtual.c
> index 15257634a53a..2cc480d65394 100644
> --- a/drivers/gpu/drm/amd/amdgpu/dce_virtual.c
> +++ b/drivers/gpu/drm/amd/amdgpu/dce_virtual.c
> @@ -649,8 +649,7 @@ static const struct amdgpu_display_funcs dce_virtual_display_funcs = {
>
> static void dce_virtual_set_display_funcs(struct amdgpu_device *adev)
> {
> - if (adev->mode_info.funcs == NULL)
> - adev->mode_info.funcs = &dce_virtual_display_funcs;
> + adev->mode_info.funcs = &dce_virtual_display_funcs;
> }
>
> static int dce_virtual_pageflip(struct amdgpu_device *adev,
> diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
> index 4411463ca719..3b8ac4442f06 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
> @@ -1180,8 +1180,7 @@ static const struct amdgpu_irq_src_funcs gmc_v6_0_irq_funcs = {
>
> static void gmc_v6_0_set_gmc_funcs(struct amdgpu_device *adev)
> {
> - if (adev->gmc.gmc_funcs == NULL)
> - adev->gmc.gmc_funcs = &gmc_v6_0_gmc_funcs;
> + adev->gmc.gmc_funcs = &gmc_v6_0_gmc_funcs;
> }
>
> static void gmc_v6_0_set_irq_funcs(struct amdgpu_device *adev)
> diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
> index ae776ce9a415..899634ce4238 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c
> @@ -1388,8 +1388,7 @@ static const struct amdgpu_irq_src_funcs gmc_v7_0_irq_funcs = {
>
> static void gmc_v7_0_set_gmc_funcs(struct amdgpu_device *adev)
> {
> - if (adev->gmc.gmc_funcs == NULL)
> - adev->gmc.gmc_funcs = &gmc_v7_0_gmc_funcs;
> + adev->gmc.gmc_funcs = &gmc_v7_0_gmc_funcs;
> }
>
> static void gmc_v7_0_set_irq_funcs(struct amdgpu_device *adev)
> diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
> index 53ae49b8bde8..79143ca7cfac 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
> @@ -1733,8 +1733,7 @@ static const struct amdgpu_irq_src_funcs gmc_v8_0_irq_funcs = {
>
> static void gmc_v8_0_set_gmc_funcs(struct amdgpu_device *adev)
> {
> - if (adev->gmc.gmc_funcs == NULL)
> - adev->gmc.gmc_funcs = &gmc_v8_0_gmc_funcs;
> + adev->gmc.gmc_funcs = &gmc_v8_0_gmc_funcs;
> }
>
> static void gmc_v8_0_set_irq_funcs(struct amdgpu_device *adev)
> diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
> index aad3c7c5fb3a..f35d7a554ad5 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
> @@ -593,8 +593,7 @@ static const struct amdgpu_gmc_funcs gmc_v9_0_gmc_funcs = {
>
> static void gmc_v9_0_set_gmc_funcs(struct amdgpu_device *adev)
> {
> - if (adev->gmc.gmc_funcs == NULL)
> - adev->gmc.gmc_funcs = &gmc_v9_0_gmc_funcs;
> + adev->gmc.gmc_funcs = &gmc_v9_0_gmc_funcs;
> }
>
> static int gmc_v9_0_early_init(void *handle)
> diff --git a/drivers/gpu/drm/amd/amdgpu/iceland_ih.c b/drivers/gpu/drm/amd/amdgpu/iceland_ih.c
> index 842c4b677b4d..45ef0a818e11 100644
> --- a/drivers/gpu/drm/amd/amdgpu/iceland_ih.c
> +++ b/drivers/gpu/drm/amd/amdgpu/iceland_ih.c
> @@ -447,8 +447,7 @@ static const struct amdgpu_ih_funcs iceland_ih_funcs = {
>
> static void iceland_ih_set_interrupt_funcs(struct amdgpu_device *adev)
> {
> - if (adev->irq.ih_funcs == NULL)
> - adev->irq.ih_funcs = &iceland_ih_funcs;
> + adev->irq.ih_funcs = &iceland_ih_funcs;
> }
>
> const struct amdgpu_ip_block_version iceland_ih_ip_block =
> diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
> index c403bdf8ad70..0c5a576dee13 100644
> --- a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
> +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
> @@ -1296,10 +1296,8 @@ static const struct amdgpu_buffer_funcs sdma_v2_4_buffer_funcs = {
>
> static void sdma_v2_4_set_buffer_funcs(struct amdgpu_device *adev)
> {
> - if (adev->mman.buffer_funcs == NULL) {
> - adev->mman.buffer_funcs = &sdma_v2_4_buffer_funcs;
> - adev->mman.buffer_funcs_ring = &adev->sdma.instance[0].ring;
> - }
> + adev->mman.buffer_funcs = &sdma_v2_4_buffer_funcs;
> + adev->mman.buffer_funcs_ring = &adev->sdma.instance[0].ring;
> }
>
> static const struct amdgpu_vm_pte_funcs sdma_v2_4_vm_pte_funcs = {
> @@ -1315,15 +1313,13 @@ static void sdma_v2_4_set_vm_pte_funcs(struct amdgpu_device *adev)
> struct drm_gpu_scheduler *sched;
> unsigned i;
>
> - if (adev->vm_manager.vm_pte_funcs == NULL) {
> - adev->vm_manager.vm_pte_funcs = &sdma_v2_4_vm_pte_funcs;
> - for (i = 0; i < adev->sdma.num_instances; i++) {
> - sched = &adev->sdma.instance[i].ring.sched;
> - adev->vm_manager.vm_pte_rqs[i] =
> - &sched->sched_rq[DRM_SCHED_PRIORITY_KERNEL];
> - }
> - adev->vm_manager.vm_pte_num_rqs = adev->sdma.num_instances;
> + adev->vm_manager.vm_pte_funcs = &sdma_v2_4_vm_pte_funcs;
> + for (i = 0; i < adev->sdma.num_instances; i++) {
> + sched = &adev->sdma.instance[i].ring.sched;
> + adev->vm_manager.vm_pte_rqs[i] =
> + &sched->sched_rq[DRM_SCHED_PRIORITY_KERNEL];
> }
> + adev->vm_manager.vm_pte_num_rqs = adev->sdma.num_instances;
> }
>
> const struct amdgpu_ip_block_version sdma_v2_4_ip_block =
> diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
> index 2677d6a1bf42..2587b8de918a 100644
> --- a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
> @@ -1736,10 +1736,8 @@ static const struct amdgpu_buffer_funcs sdma_v3_0_buffer_funcs = {
>
> static void sdma_v3_0_set_buffer_funcs(struct amdgpu_device *adev)
> {
> - if (adev->mman.buffer_funcs == NULL) {
> - adev->mman.buffer_funcs = &sdma_v3_0_buffer_funcs;
> - adev->mman.buffer_funcs_ring = &adev->sdma.instance[0].ring;
> - }
> + adev->mman.buffer_funcs = &sdma_v3_0_buffer_funcs;
> + adev->mman.buffer_funcs_ring = &adev->sdma.instance[0].ring;
> }
>
> static const struct amdgpu_vm_pte_funcs sdma_v3_0_vm_pte_funcs = {
> @@ -1755,15 +1753,13 @@ static void sdma_v3_0_set_vm_pte_funcs(struct amdgpu_device *adev)
> struct drm_gpu_scheduler *sched;
> unsigned i;
>
> - if (adev->vm_manager.vm_pte_funcs == NULL) {
> - adev->vm_manager.vm_pte_funcs = &sdma_v3_0_vm_pte_funcs;
> - for (i = 0; i < adev->sdma.num_instances; i++) {
> - sched = &adev->sdma.instance[i].ring.sched;
> - adev->vm_manager.vm_pte_rqs[i] =
> - &sched->sched_rq[DRM_SCHED_PRIORITY_KERNEL];
> - }
> - adev->vm_manager.vm_pte_num_rqs = adev->sdma.num_instances;
> + adev->vm_manager.vm_pte_funcs = &sdma_v3_0_vm_pte_funcs;
> + for (i = 0; i < adev->sdma.num_instances; i++) {
> + sched = &adev->sdma.instance[i].ring.sched;
> + adev->vm_manager.vm_pte_rqs[i] =
> + &sched->sched_rq[DRM_SCHED_PRIORITY_KERNEL];
> }
> + adev->vm_manager.vm_pte_num_rqs = adev->sdma.num_instances;
> }
>
> const struct amdgpu_ip_block_version sdma_v3_0_ip_block =
> diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
> index 9da4a1bff5c5..a3e2ed15fff2 100644
> --- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
> @@ -1807,10 +1807,8 @@ static const struct amdgpu_buffer_funcs sdma_v4_0_buffer_funcs = {
>
> static void sdma_v4_0_set_buffer_funcs(struct amdgpu_device *adev)
> {
> - if (adev->mman.buffer_funcs == NULL) {
> - adev->mman.buffer_funcs = &sdma_v4_0_buffer_funcs;
> - adev->mman.buffer_funcs_ring = &adev->sdma.instance[0].ring;
> - }
> + adev->mman.buffer_funcs = &sdma_v4_0_buffer_funcs;
> + adev->mman.buffer_funcs_ring = &adev->sdma.instance[0].ring;
> }
>
> static const struct amdgpu_vm_pte_funcs sdma_v4_0_vm_pte_funcs = {
> @@ -1826,15 +1824,13 @@ static void sdma_v4_0_set_vm_pte_funcs(struct amdgpu_device *adev)
> struct drm_gpu_scheduler *sched;
> unsigned i;
>
> - if (adev->vm_manager.vm_pte_funcs == NULL) {
> - adev->vm_manager.vm_pte_funcs = &sdma_v4_0_vm_pte_funcs;
> - for (i = 0; i < adev->sdma.num_instances; i++) {
> - sched = &adev->sdma.instance[i].ring.sched;
> - adev->vm_manager.vm_pte_rqs[i] =
> - &sched->sched_rq[DRM_SCHED_PRIORITY_KERNEL];
> - }
> - adev->vm_manager.vm_pte_num_rqs = adev->sdma.num_instances;
> + adev->vm_manager.vm_pte_funcs = &sdma_v4_0_vm_pte_funcs;
> + for (i = 0; i < adev->sdma.num_instances; i++) {
> + sched = &adev->sdma.instance[i].ring.sched;
> + adev->vm_manager.vm_pte_rqs[i] =
> + &sched->sched_rq[DRM_SCHED_PRIORITY_KERNEL];
> }
> + adev->vm_manager.vm_pte_num_rqs = adev->sdma.num_instances;
> }
>
> const struct amdgpu_ip_block_version sdma_v4_0_ip_block = {
> diff --git a/drivers/gpu/drm/amd/amdgpu/si_dma.c b/drivers/gpu/drm/amd/amdgpu/si_dma.c
> index fafaf259b17b..c3510a703f9f 100644
> --- a/drivers/gpu/drm/amd/amdgpu/si_dma.c
> +++ b/drivers/gpu/drm/amd/amdgpu/si_dma.c
> @@ -863,10 +863,8 @@ static const struct amdgpu_buffer_funcs si_dma_buffer_funcs = {
>
> static void si_dma_set_buffer_funcs(struct amdgpu_device *adev)
> {
> - if (adev->mman.buffer_funcs == NULL) {
> - adev->mman.buffer_funcs = &si_dma_buffer_funcs;
> - adev->mman.buffer_funcs_ring = &adev->sdma.instance[0].ring;
> - }
> + adev->mman.buffer_funcs = &si_dma_buffer_funcs;
> + adev->mman.buffer_funcs_ring = &adev->sdma.instance[0].ring;
> }
>
> static const struct amdgpu_vm_pte_funcs si_dma_vm_pte_funcs = {
> @@ -882,15 +880,13 @@ static void si_dma_set_vm_pte_funcs(struct amdgpu_device *adev)
> struct drm_gpu_scheduler *sched;
> unsigned i;
>
> - if (adev->vm_manager.vm_pte_funcs == NULL) {
> - adev->vm_manager.vm_pte_funcs = &si_dma_vm_pte_funcs;
> - for (i = 0; i < adev->sdma.num_instances; i++) {
> - sched = &adev->sdma.instance[i].ring.sched;
> - adev->vm_manager.vm_pte_rqs[i] =
> - &sched->sched_rq[DRM_SCHED_PRIORITY_KERNEL];
> - }
> - adev->vm_manager.vm_pte_num_rqs = adev->sdma.num_instances;
> + adev->vm_manager.vm_pte_funcs = &si_dma_vm_pte_funcs;
> + for (i = 0; i < adev->sdma.num_instances; i++) {
> + sched = &adev->sdma.instance[i].ring.sched;
> + adev->vm_manager.vm_pte_rqs[i] =
> + &sched->sched_rq[DRM_SCHED_PRIORITY_KERNEL];
> }
> + adev->vm_manager.vm_pte_num_rqs = adev->sdma.num_instances;
> }
>
> const struct amdgpu_ip_block_version si_dma_ip_block =
> diff --git a/drivers/gpu/drm/amd/amdgpu/si_ih.c b/drivers/gpu/drm/amd/amdgpu/si_ih.c
> index 60dad63098a2..97711d327527 100644
> --- a/drivers/gpu/drm/amd/amdgpu/si_ih.c
> +++ b/drivers/gpu/drm/amd/amdgpu/si_ih.c
> @@ -308,8 +308,7 @@ static const struct amdgpu_ih_funcs si_ih_funcs = {
>
> static void si_ih_set_interrupt_funcs(struct amdgpu_device *adev)
> {
> - if (adev->irq.ih_funcs == NULL)
> - adev->irq.ih_funcs = &si_ih_funcs;
> + adev->irq.ih_funcs = &si_ih_funcs;
> }
>
> const struct amdgpu_ip_block_version si_ih_ip_block =
> diff --git a/drivers/gpu/drm/amd/amdgpu/tonga_ih.c b/drivers/gpu/drm/amd/amdgpu/tonga_ih.c
> index 52853d8a8fdd..a79a3776888a 100644
> --- a/drivers/gpu/drm/amd/amdgpu/tonga_ih.c
> +++ b/drivers/gpu/drm/amd/amdgpu/tonga_ih.c
> @@ -513,8 +513,7 @@ static const struct amdgpu_ih_funcs tonga_ih_funcs = {
>
> static void tonga_ih_set_interrupt_funcs(struct amdgpu_device *adev)
> {
> - if (adev->irq.ih_funcs == NULL)
> - adev->irq.ih_funcs = &tonga_ih_funcs;
> + adev->irq.ih_funcs = &tonga_ih_funcs;
> }
>
> const struct amdgpu_ip_block_version tonga_ih_ip_block =
> diff --git a/drivers/gpu/drm/amd/amdgpu/vega10_ih.c b/drivers/gpu/drm/amd/amdgpu/vega10_ih.c
> index acbe5a770207..37487b4cbd6e 100644
> --- a/drivers/gpu/drm/amd/amdgpu/vega10_ih.c
> +++ b/drivers/gpu/drm/amd/amdgpu/vega10_ih.c
> @@ -494,8 +494,7 @@ static const struct amdgpu_ih_funcs vega10_ih_funcs = {
>
> static void vega10_ih_set_interrupt_funcs(struct amdgpu_device *adev)
> {
> - if (adev->irq.ih_funcs == NULL)
> - adev->irq.ih_funcs = &vega10_ih_funcs;
> + adev->irq.ih_funcs = &vega10_ih_funcs;
> }
>
> const struct amdgpu_ip_block_version vega10_ih_ip_block =
> --
> 2.14.1
>
> _______________________________________________
> 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
next prev parent reply other threads:[~2018-09-25 10:03 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-24 12:38 [PATCH 1/9] drm/amdgpu: drop extra newline in amdgpu_iv trace Christian König
[not found] ` <20180924123820.1873-1-christian.koenig-5C7GfCeVMHo@public.gmane.org>
2018-09-24 12:38 ` [PATCH 2/9] drm/amdgpu: make function pointers mandatory Christian König
[not found] ` <20180924123820.1873-2-christian.koenig-5C7GfCeVMHo@public.gmane.org>
2018-09-25 10:03 ` Huang Rui [this message]
2018-09-24 12:38 ` [PATCH 3/9] drm/amdgpu: cleanup amdgpu_ih.c Christian König
[not found] ` <20180924123820.1873-3-christian.koenig-5C7GfCeVMHo@public.gmane.org>
2018-09-25 10:28 ` Huang Rui
2018-09-25 11:01 ` Christian König
[not found] ` <ea1b4ebf-c4ee-c03b-b3e7-6f66df831373-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2018-09-26 8:52 ` Huang, Ray
[not found] ` <BY2PR12MB0040B93400AD69D00699F870EC150-K//h7OWB4q7Zvl48JdS6+wdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org>
2018-09-26 8:57 ` Christian König
[not found] ` <366f6d5f-67f8-0d86-274c-bf93a59c60d3-5C7GfCeVMHo@public.gmane.org>
2018-09-26 10:36 ` Huang, Ray
2018-09-24 12:38 ` [PATCH 4/9] drm/amdgpu: move more interrupt processing into amdgpu_irq.c Christian König
[not found] ` <20180924123820.1873-4-christian.koenig-5C7GfCeVMHo@public.gmane.org>
2018-09-26 6:13 ` Huang Rui
2018-09-24 12:38 ` [PATCH 5/9] drm/amdgpu: move more defines into amdgpu_irq.h Christian König
[not found] ` <20180924123820.1873-5-christian.koenig-5C7GfCeVMHo@public.gmane.org>
2018-09-26 6:14 ` Huang Rui
2018-09-24 12:38 ` [PATCH 6/9] drm/amdgpu: separate IH and IRQ funcs Christian König
[not found] ` <20180924123820.1873-6-christian.koenig-5C7GfCeVMHo@public.gmane.org>
2018-09-26 6:05 ` Huang Rui
2018-09-26 8:09 ` Christian König
[not found] ` <39fb9a51-2e85-0828-a193-b54059dec405-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2018-09-26 9:16 ` Huang, Ray
[not found] ` <BY2PR12MB00400B029B1F4C1256CE558AEC150-K//h7OWB4q7Zvl48JdS6+wdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org>
2018-09-26 9:18 ` Christian König
2018-09-24 12:38 ` [PATCH 7/9] drm/amdgpu: add IH ring to ih_get_wptr/ih_set_rptr Christian König
[not found] ` <20180924123820.1873-7-christian.koenig-5C7GfCeVMHo@public.gmane.org>
2018-09-26 7:36 ` Huang Rui
2018-09-26 7:40 ` Huang Rui
2018-09-24 12:38 ` [PATCH 8/9] drm/amdgpu: simplify IH programming Christian König
[not found] ` <20180924123820.1873-8-christian.koenig-5C7GfCeVMHo@public.gmane.org>
2018-09-26 8:48 ` Huang, Ray
2018-09-24 12:38 ` [PATCH 9/9] drm/amdgpu: enable IH ring 1 and ring 2 Christian König
[not found] ` <20180924123820.1873-9-christian.koenig-5C7GfCeVMHo@public.gmane.org>
2018-09-26 8:49 ` Huang, Ray
2018-09-25 9:54 ` [PATCH 1/9] drm/amdgpu: drop extra newline in amdgpu_iv trace Huang Rui
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180925100328.GC30495@hr-amur2 \
--to=ray.huang-5c7gfcevmho@public.gmane.org \
--cc=amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org \
--cc=ckoenig.leichtzumerken-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox