diff options
author | Huang Rui <ray.huang@amd.com> | 2017-05-31 10:57:18 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2017-06-06 16:58:36 -0400 |
commit | 0c8c0847cc68e33ddececfbfdffc3ef8dec4e677 (patch) | |
tree | fc73b83b4338749429e1759348155e7cd89fec95 /drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | |
parent | 1e4eccdaf293695f4781ce8b08d3b542d87173c5 (diff) |
drm/amdgpu: export gfxhub sw_init into gmc
Signed-off-by: Huang Rui <ray.huang@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Acked-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c b/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c index bbc310c97070..9198eb538ebb 100644 --- a/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | |||
@@ -337,19 +337,8 @@ void gfxhub_v1_0_set_fault_enable_default(struct amdgpu_device *adev, | |||
337 | WREG32(SOC15_REG_OFFSET(GC, 0, mmVM_L2_PROTECTION_FAULT_CNTL), tmp); | 337 | WREG32(SOC15_REG_OFFSET(GC, 0, mmVM_L2_PROTECTION_FAULT_CNTL), tmp); |
338 | } | 338 | } |
339 | 339 | ||
340 | static int gfxhub_v1_0_early_init(void *handle) | 340 | void gfxhub_v1_0_init(struct amdgpu_device *adev) |
341 | { | ||
342 | return 0; | ||
343 | } | ||
344 | |||
345 | static int gfxhub_v1_0_late_init(void *handle) | ||
346 | { | 341 | { |
347 | return 0; | ||
348 | } | ||
349 | |||
350 | static int gfxhub_v1_0_sw_init(void *handle) | ||
351 | { | ||
352 | struct amdgpu_device *adev = (struct amdgpu_device *)handle; | ||
353 | struct amdgpu_vmhub *hub = &adev->vmhub[AMDGPU_GFXHUB]; | 342 | struct amdgpu_vmhub *hub = &adev->vmhub[AMDGPU_GFXHUB]; |
354 | 343 | ||
355 | hub->ctx0_ptb_addr_lo32 = | 344 | hub->ctx0_ptb_addr_lo32 = |
@@ -368,7 +357,20 @@ static int gfxhub_v1_0_sw_init(void *handle) | |||
368 | SOC15_REG_OFFSET(GC, 0, mmVM_L2_PROTECTION_FAULT_STATUS); | 357 | SOC15_REG_OFFSET(GC, 0, mmVM_L2_PROTECTION_FAULT_STATUS); |
369 | hub->vm_l2_pro_fault_cntl = | 358 | hub->vm_l2_pro_fault_cntl = |
370 | SOC15_REG_OFFSET(GC, 0, mmVM_L2_PROTECTION_FAULT_CNTL); | 359 | SOC15_REG_OFFSET(GC, 0, mmVM_L2_PROTECTION_FAULT_CNTL); |
360 | } | ||
371 | 361 | ||
362 | static int gfxhub_v1_0_early_init(void *handle) | ||
363 | { | ||
364 | return 0; | ||
365 | } | ||
366 | |||
367 | static int gfxhub_v1_0_late_init(void *handle) | ||
368 | { | ||
369 | return 0; | ||
370 | } | ||
371 | |||
372 | static int gfxhub_v1_0_sw_init(void *handle) | ||
373 | { | ||
372 | return 0; | 374 | return 0; |
373 | } | 375 | } |
374 | 376 | ||