From: Felix Kuehling <felix.kuehling-5C7GfCeVMHo@public.gmane.org>
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org,
"Deucher,
Alexander" <Alexander.Deucher-5C7GfCeVMHo@public.gmane.org>
Subject: Re: [PATCH] drm/amdgpu: setup the shared and private apertures on gfx9
Date: Fri, 29 Dec 2017 14:23:05 -0500 [thread overview]
Message-ID: <5f306993-15c4-8016-0c85-c3e35728e887@amd.com> (raw)
In-Reply-To: <20171208201046.14655-1-alexander.deucher-5C7GfCeVMHo@public.gmane.org>
On 2017-12-08 03:10 PM, Alex Deucher wrote:
> Same as previous asics. This was not yet set for gfx9.
>
> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 17 ++++++++++++-----
> drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 8 ++++++++
> 2 files changed, 20 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
> index 3fd13b77e71e..7564f87b084e 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
> @@ -1529,11 +1529,18 @@ static void gfx_v9_0_gpu_init(struct amdgpu_device *adev)
> for (i = 0; i < 16; i++) {
On GFXv8 this loop uses adev->vm_manager.id_mgr[0].num_ids instead of
hard-coded 16. No need for you to initialize the VMIDs used by KFD.
Regards,
Felix
> soc15_grbm_select(adev, 0, 0, 0, i);
> /* CP and shaders */
> - tmp = 0;
> - tmp = REG_SET_FIELD(tmp, SH_MEM_CONFIG, ALIGNMENT_MODE,
> - SH_MEM_ALIGNMENT_MODE_UNALIGNED);
> - WREG32_SOC15(GC, 0, mmSH_MEM_CONFIG, tmp);
> - WREG32_SOC15(GC, 0, mmSH_MEM_BASES, 0);
> + if (i == 0) {
> + tmp = REG_SET_FIELD(0, SH_MEM_CONFIG, ALIGNMENT_MODE,
> + SH_MEM_ALIGNMENT_MODE_UNALIGNED);
> + WREG32_SOC15(GC, 0, mmSH_MEM_CONFIG, tmp);
> + WREG32_SOC15(GC, 0, mmSH_MEM_BASES, 0);
> + } else {
> + tmp = REG_SET_FIELD(0, SH_MEM_CONFIG, ALIGNMENT_MODE,
> + SH_MEM_ALIGNMENT_MODE_UNALIGNED);
> + WREG32_SOC15(GC, 0, mmSH_MEM_CONFIG, tmp);
> + tmp = adev->mc.shared_aperture_start >> 48;
> + WREG32_SOC15(GC, 0, mmSH_MEM_BASES, tmp);
> + }
> }
> soc15_grbm_select(adev, 0, 0, 0, 0);
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
> index 695e0eada1cd..dbfb746a390c 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
> @@ -497,6 +497,14 @@ static int gmc_v9_0_early_init(void *handle)
> gmc_v9_0_set_gart_funcs(adev);
> gmc_v9_0_set_irq_funcs(adev);
>
> + adev->mc.shared_aperture_start = 0x2000000000000000ULL;
> + adev->mc.shared_aperture_end =
> + adev->mc.shared_aperture_start + (4ULL << 30) - 1;
> + adev->mc.private_aperture_start =
> + adev->mc.shared_aperture_end + 1;
> + adev->mc.private_aperture_end =
> + adev->mc.private_aperture_start + (4ULL << 30) - 1;
> +
> return 0;
> }
>
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
prev parent reply other threads:[~2017-12-29 19:23 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-08 20:10 [PATCH] drm/amdgpu: setup the shared and private apertures on gfx9 Alex Deucher
[not found] ` <20171208201046.14655-1-alexander.deucher-5C7GfCeVMHo@public.gmane.org>
2017-12-14 15:25 ` Alex Deucher
[not found] ` <CADnq5_MyzRY1EivgbBehFRL_FJnQmCbV1VJZqvR4gVhVmGTSzA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2017-12-15 10:04 ` Christian König
2017-12-29 19:23 ` Felix Kuehling [this message]
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=5f306993-15c4-8016-0c85-c3e35728e887@amd.com \
--to=felix.kuehling-5c7gfcevmho@public.gmane.org \
--cc=Alexander.Deucher-5C7GfCeVMHo@public.gmane.org \
--cc=amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.