TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/amdgpu: move adjust_mc_addr into amdgpu_gart_funcs

Browse Source 
We should probably rename amdgpu_gart_funcs sooner or later.

Reviewed-by: Junwei Zhang <Jerry.Zhang@amd.com>
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Christian König
2017-03-30 15:55:07 +02:00
committed by Alex Deucher
parent f7d015b90d
commit f75e237c41
3 changed files with 9 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/gpu/drm/amd/amdgpu/amdgpu.h
-5
View File
@@ -304,10 +304,6 @@ struct amdgpu_gart_funcs {
/* set pte flags based per asic */ /* set pte flags based per asic */
uint64_t (*get_vm_pte_flags)(struct amdgpu_device *adev, uint64_t (*get_vm_pte_flags)(struct amdgpu_device *adev,
uint32_t flags); uint32_t flags);
};
/* provided by the mc block */
struct amdgpu_mc_funcs {
/* adjust mc addr in fb for APU case */ /* adjust mc addr in fb for APU case */
u64 (*adjust_mc_addr)(struct amdgpu_device *adev, u64 addr); u64 (*adjust_mc_addr)(struct amdgpu_device *adev, u64 addr);
}; };
@@ -613,7 +609,6 @@ struct amdgpu_mc {
u64 private_aperture_end; u64 private_aperture_end;
/* protects concurrent invalidation */ /* protects concurrent invalidation */
spinlock_t invalidate_lock; spinlock_t invalidate_lock;
const struct amdgpu_mc_funcs *mc_funcs;
}; };
/* /*
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+2 -2
View File
@@ -571,8 +571,8 @@ static u64 amdgpu_vm_adjust_mc_addr(struct amdgpu_device *adev, u64 mc_addr)
{ {
u64 addr = mc_addr; u64 addr = mc_addr;
if (adev->mc.mc_funcs && adev->mc.mc_funcs->adjust_mc_addr) if (adev->gart.gart_funcs->adjust_mc_addr)
addr = adev->mc.mc_funcs->adjust_mc_addr(adev, addr); addr = adev->gart.gart_funcs->adjust_mc_addr(adev, addr);
return addr; return addr;
} }
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c
+7 -16
View File
@@ -331,10 +331,16 @@ static uint64_t gmc_v9_0_get_vm_pte_flags(struct amdgpu_device *adev,
return pte_flag; return pte_flag;
} }
static u64 gmc_v9_0_adjust_mc_addr(struct amdgpu_device *adev, u64 mc_addr)
{
return adev->vm_manager.vram_base_offset + mc_addr - adev->mc.vram_start;
}
static const struct amdgpu_gart_funcs gmc_v9_0_gart_funcs = { static const struct amdgpu_gart_funcs gmc_v9_0_gart_funcs = {
.flush_gpu_tlb = gmc_v9_0_gart_flush_gpu_tlb, .flush_gpu_tlb = gmc_v9_0_gart_flush_gpu_tlb,
.set_pte_pde = gmc_v9_0_gart_set_pte_pde, .set_pte_pde = gmc_v9_0_gart_set_pte_pde,
.get_vm_pte_flags = gmc_v9_0_get_vm_pte_flags .get_vm_pte_flags = gmc_v9_0_get_vm_pte_flags,
.adjust_mc_addr = gmc_v9_0_adjust_mc_addr,
}; };
static void gmc_v9_0_set_gart_funcs(struct amdgpu_device *adev) static void gmc_v9_0_set_gart_funcs(struct amdgpu_device *adev)
@@ -343,26 +349,11 @@ static void gmc_v9_0_set_gart_funcs(struct amdgpu_device *adev)
adev->gart.gart_funcs = &gmc_v9_0_gart_funcs; adev->gart.gart_funcs = &gmc_v9_0_gart_funcs;
} }
static u64 gmc_v9_0_adjust_mc_addr(struct amdgpu_device *adev, u64 mc_addr)
{
return adev->vm_manager.vram_base_offset + mc_addr - adev->mc.vram_start;
}
static const struct amdgpu_mc_funcs gmc_v9_0_mc_funcs = {
.adjust_mc_addr = gmc_v9_0_adjust_mc_addr,
};
static void gmc_v9_0_set_mc_funcs(struct amdgpu_device *adev)
{
adev->mc.mc_funcs = &gmc_v9_0_mc_funcs;
}
static int gmc_v9_0_early_init(void *handle) static int gmc_v9_0_early_init(void *handle)
{ {
struct amdgpu_device *adev = (struct amdgpu_device *)handle; struct amdgpu_device *adev = (struct amdgpu_device *)handle;
gmc_v9_0_set_gart_funcs(adev); gmc_v9_0_set_gart_funcs(adev);
gmc_v9_0_set_mc_funcs(adev);
gmc_v9_0_set_irq_funcs(adev); gmc_v9_0_set_irq_funcs(adev);
return 0; return 0;