From: Yong Zhao <yong.zhao@amd.com>
To: Felix Kuehling <Felix.Kuehling@amd.com>, amd-gfx@lists.freedesktop.org
Subject: Re: [PATCH 1/3] drm/amdgpu: Fix TLB invalidation request when using semaphore
Date: Mon, 20 Jan 2020 11:20:29 -0500 [thread overview]
Message-ID: <f8baf7a3-7529-72e9-6931-87e0b2d75478@amd.com> (raw)
In-Reply-To: <20200118013735.19361-1-Felix.Kuehling@amd.com>
Reviewed-by: Yong Zhao <Yong.Zhao@amd.com>
On 2020-01-17 8:37 p.m., Felix Kuehling wrote:
> Use a more meaningful variable name for the invalidation request
> that is distinct from the tmp variable that gets overwritten when
> acquiring the invalidation semaphore.
>
> Fixes: 00f607f38d82 ("drm/amdgpu: invalidate mmhub semaphore workaround in gmc9/gmc10")
> Signed-off-by: Felix Kuehling <Felix.Kuehling@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 5 +++--
> drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 8 ++++----
> 2 files changed, 7 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
> index 86f4ffe408e7..d914555e1212 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c
> @@ -262,7 +262,8 @@ static void gmc_v10_0_flush_vm_hub(struct amdgpu_device *adev, uint32_t vmid,
> {
> bool use_semaphore = gmc_v10_0_use_invalidate_semaphore(adev, vmhub);
> struct amdgpu_vmhub *hub = &adev->vmhub[vmhub];
> - u32 tmp = gmc_v10_0_get_invalidate_req(vmid, flush_type);
> + u32 inv_req = gmc_v10_0_get_invalidate_req(vmid, flush_type);
> + u32 tmp;
> /* Use register 17 for GART */
> const unsigned eng = 17;
> unsigned int i;
> @@ -289,7 +290,7 @@ static void gmc_v10_0_flush_vm_hub(struct amdgpu_device *adev, uint32_t vmid,
> DRM_ERROR("Timeout waiting for sem acquire in VM flush!\n");
> }
>
> - WREG32_NO_KIQ(hub->vm_inv_eng0_req + eng, tmp);
> + WREG32_NO_KIQ(hub->vm_inv_eng0_req + eng, inv_req);
>
> /*
> * Issue a dummy read to wait for the ACK register to be cleared
> diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
> index 54bdc1786ab1..6d95de1413c4 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
> @@ -476,13 +476,13 @@ static void gmc_v9_0_flush_gpu_tlb(struct amdgpu_device *adev, uint32_t vmid,
> {
> bool use_semaphore = gmc_v9_0_use_invalidate_semaphore(adev, vmhub);
> const unsigned eng = 17;
> - u32 j, tmp;
> + u32 j, inv_req, tmp;
> struct amdgpu_vmhub *hub;
>
> BUG_ON(vmhub >= adev->num_vmhubs);
>
> hub = &adev->vmhub[vmhub];
> - tmp = gmc_v9_0_get_invalidate_req(vmid, flush_type);
> + inv_req = gmc_v9_0_get_invalidate_req(vmid, flush_type);
>
> /* This is necessary for a HW workaround under SRIOV as well
> * as GFXOFF under bare metal
> @@ -493,7 +493,7 @@ static void gmc_v9_0_flush_gpu_tlb(struct amdgpu_device *adev, uint32_t vmid,
> uint32_t req = hub->vm_inv_eng0_req + eng;
> uint32_t ack = hub->vm_inv_eng0_ack + eng;
>
> - amdgpu_virt_kiq_reg_write_reg_wait(adev, req, ack, tmp,
> + amdgpu_virt_kiq_reg_write_reg_wait(adev, req, ack, inv_req,
> 1 << vmid);
> return;
> }
> @@ -521,7 +521,7 @@ static void gmc_v9_0_flush_gpu_tlb(struct amdgpu_device *adev, uint32_t vmid,
> DRM_ERROR("Timeout waiting for sem acquire in VM flush!\n");
> }
>
> - WREG32_NO_KIQ(hub->vm_inv_eng0_req + eng, tmp);
> + WREG32_NO_KIQ(hub->vm_inv_eng0_req + eng, inv_req);
>
> /*
> * Issue a dummy read to wait for the ACK register to be cleared
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
next prev parent reply other threads:[~2020-01-20 16:20 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-18 1:37 [PATCH 1/3] drm/amdgpu: Fix TLB invalidation request when using semaphore Felix Kuehling
2020-01-18 1:37 ` [PATCH 2/3] drm/amdgpu: Use the correct flush_type in flush_gpu_tlb_pasid Felix Kuehling
2020-01-20 16:37 ` Zeng, Oak
2020-01-18 1:37 ` [PATCH 3/3] drm/amdgpu: Improve Vega20 XGMI TLB flush workaround Felix Kuehling
2020-01-20 16:41 ` Zeng, Oak
2020-01-20 17:47 ` shaoyunl
2020-01-20 17:58 ` Felix Kuehling
2020-01-20 18:28 ` shaoyunl
2020-01-20 18:40 ` Felix Kuehling
2020-01-20 18:50 ` shaoyunl
2020-01-18 13:22 ` [PATCH 1/3] drm/amdgpu: Fix TLB invalidation request when using semaphore Christian König
2020-01-20 16:20 ` Yong Zhao [this message]
2020-01-21 22:41 ` Felix Kuehling
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=f8baf7a3-7529-72e9-6931-87e0b2d75478@amd.com \
--to=yong.zhao@amd.com \
--cc=Felix.Kuehling@amd.com \
--cc=amd-gfx@lists.freedesktop.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;
as well as URLs for NNTP newsgroup(s).