Pushed. Thanks!
Yong From: Kuehling, Felix
Sent: Tuesday, October 23, 2018 4:43:05 PM To: Zhao, Yong; amd-gfx@xxxxxxxxxxxxxxxxxxxxx; brahma_sw_dev Subject: Re: [PATCH 2/2] drm/amdkfd: page_table_base already have the flags needed The series is Reviewed-by: Felix Kuehling <Felix.Kuehling@xxxxxxx>
On 2018-10-23 1:00 p.m., Zhao, Yong wrote: > > How about those two patches? > > > Yong > > ------------------------------------------------------------------------ > *From:* Zhao, Yong > *Sent:* Monday, October 22, 2018 2:33:26 PM > *To:* amd-gfx@xxxxxxxxxxxxxxxxxxxxx; brahma_sw_dev > *Cc:* Zhao, Yong > *Subject:* [PATCH 2/2] drm/amdkfd: page_table_base already have the > flags needed > > The flags are added when calling amdgpu_gmc_pd_addr(). > > Change-Id: Idd85b1ac35d3d100154df8229ea20721d9a7045c > Signed-off-by: Yong Zhao <Yong.Zhao@xxxxxxx> > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 5 ++--- > drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 1 + > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c > b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c > index 54c3690..60b5f56c 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c > @@ -978,7 +978,6 @@ static void set_vm_context_page_table_base(struct > kgd_dev *kgd, uint32_t vmid, > uint64_t page_table_base) > { > struct amdgpu_device *adev = get_amdgpu_device(kgd); > - uint64_t base = page_table_base | AMDGPU_PTE_VALID; > > if (!amdgpu_amdkfd_is_kfd_vmid(adev, vmid)) { > pr_err("trying to set page table base for wrong VMID > %u\n", > @@ -990,7 +989,7 @@ static void set_vm_context_page_table_base(struct > kgd_dev *kgd, uint32_t vmid, > * now, all processes share the same address space size, like > * on GFX8 and older. > */ > - mmhub_v1_0_setup_vm_pt_regs(adev, vmid, base); > + mmhub_v1_0_setup_vm_pt_regs(adev, vmid, page_table_base); > > - gfxhub_v1_0_setup_vm_pt_regs(adev, vmid, base); > + gfxhub_v1_0_setup_vm_pt_regs(adev, vmid, page_table_base); > } > diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h > b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h > index 53ff86d..dec8e64 100644 > --- a/drivers/gpu/drm/amd/amdkfd/kfd_priv.h > +++ b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h > @@ -507,6 +507,7 @@ struct qcm_process_device { > * All the memory management data should be here too > */ > uint64_t gds_context_area; > + /* Contains page table flags such as AMDGPU_PTE_VALID since > gfx9 */ > uint64_t page_table_base; > uint32_t sh_mem_config; > uint32_t sh_mem_bases; > -- > 2.7.4 > |
_______________________________________________ amd-gfx mailing list amd-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/amd-gfx