diff options
author | Monk Liu <Monk.Liu@amd.com> | 2017-09-15 03:03:24 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2017-09-26 15:14:10 -0400 |
commit | 1d4e0a8c4f12acbc0767f8f9fd75005b9125ada6 (patch) | |
tree | 283823707d9627f616eb304f053084c84062ded2 | |
parent | 2ea6ab2741fc4caf9fd4a48de1b4946f09c365e0 (diff) |
drm/amdgpu:hdp flush should be put it initialized
Signed-off-by: Monk Liu <Monk.Liu@amd.com>
Acked-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c index 7ca9cbec3004..99147f576e76 100644 --- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | |||
@@ -696,12 +696,6 @@ static int gmc_v9_0_gart_enable(struct amdgpu_device *adev) | |||
696 | if (r) | 696 | if (r) |
697 | return r; | 697 | return r; |
698 | 698 | ||
699 | /* After HDP is initialized, flush HDP.*/ | ||
700 | if (adev->flags & AMD_IS_APU) | ||
701 | nbio_v7_0_hdp_flush(adev); | ||
702 | else | ||
703 | nbio_v6_1_hdp_flush(adev); | ||
704 | |||
705 | switch (adev->asic_type) { | 699 | switch (adev->asic_type) { |
706 | case CHIP_RAVEN: | 700 | case CHIP_RAVEN: |
707 | mmhub_v1_0_initialize_power_gating(adev); | 701 | mmhub_v1_0_initialize_power_gating(adev); |
@@ -724,6 +718,12 @@ static int gmc_v9_0_gart_enable(struct amdgpu_device *adev) | |||
724 | tmp = RREG32_SOC15(HDP, 0, mmHDP_HOST_PATH_CNTL); | 718 | tmp = RREG32_SOC15(HDP, 0, mmHDP_HOST_PATH_CNTL); |
725 | WREG32_SOC15(HDP, 0, mmHDP_HOST_PATH_CNTL, tmp); | 719 | WREG32_SOC15(HDP, 0, mmHDP_HOST_PATH_CNTL, tmp); |
726 | 720 | ||
721 | /* After HDP is initialized, flush HDP.*/ | ||
722 | if (adev->flags & AMD_IS_APU) | ||
723 | nbio_v7_0_hdp_flush(adev); | ||
724 | else | ||
725 | nbio_v6_1_hdp_flush(adev); | ||
726 | |||
727 | if (amdgpu_vm_fault_stop == AMDGPU_VM_FAULT_STOP_ALWAYS) | 727 | if (amdgpu_vm_fault_stop == AMDGPU_VM_FAULT_STOP_ALWAYS) |
728 | value = false; | 728 | value = false; |
729 | else | 729 | else |