Commit 1dd8b24a authored by Alex Deucher's avatar Alex Deucher

drm/amdgpu/nv: use common nbio callback to set remap offset

This fixes HDP flushes on systems with non-4K pages.
Reviewed-by: default avatarFelix Kuehling <felix.kuehling@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent c866201c
...@@ -339,10 +339,6 @@ static void nbio_v2_3_init_registers(struct amdgpu_device *adev) ...@@ -339,10 +339,6 @@ static void nbio_v2_3_init_registers(struct amdgpu_device *adev)
if (def != data) if (def != data)
WREG32_PCIE(smnPCIE_CONFIG_CNTL, data); WREG32_PCIE(smnPCIE_CONFIG_CNTL, data);
if (amdgpu_sriov_vf(adev))
adev->rmmio_remap.reg_offset = SOC15_REG_OFFSET(NBIO, 0,
mmBIF_BX_DEV0_EPF0_VF0_HDP_MEM_COHERENCY_FLUSH_CNTL) << 2;
} }
#define NAVI10_PCIE__LC_L0S_INACTIVITY_DEFAULT 0x00000000 // off by default, no gains over L1 #define NAVI10_PCIE__LC_L0S_INACTIVITY_DEFAULT 0x00000000 // off by default, no gains over L1
......
...@@ -402,10 +402,6 @@ static void nbio_v7_2_init_registers(struct amdgpu_device *adev) ...@@ -402,10 +402,6 @@ static void nbio_v7_2_init_registers(struct amdgpu_device *adev)
WREG32_SOC15(NBIO, 0, regRCC_DEV2_EPF0_STRAP2, data); WREG32_SOC15(NBIO, 0, regRCC_DEV2_EPF0_STRAP2, data);
break; break;
} }
if (amdgpu_sriov_vf(adev))
adev->rmmio_remap.reg_offset = SOC15_REG_OFFSET(NBIO, 0,
regBIF_BX_PF0_HDP_MEM_COHERENCY_FLUSH_CNTL) << 2;
} }
#define MMIO_REG_HOLE_OFFSET (0x80000 - PAGE_SIZE) #define MMIO_REG_HOLE_OFFSET (0x80000 - PAGE_SIZE)
......
...@@ -637,13 +637,9 @@ static const struct amdgpu_asic_funcs nv_asic_funcs = { ...@@ -637,13 +637,9 @@ static const struct amdgpu_asic_funcs nv_asic_funcs = {
static int nv_common_early_init(void *handle) static int nv_common_early_init(void *handle)
{ {
#define MMIO_REG_HOLE_OFFSET (0x80000 - PAGE_SIZE)
struct amdgpu_device *adev = (struct amdgpu_device *)handle; struct amdgpu_device *adev = (struct amdgpu_device *)handle;
if (!amdgpu_sriov_vf(adev)) { adev->nbio.funcs->set_reg_remap(adev);
adev->rmmio_remap.reg_offset = MMIO_REG_HOLE_OFFSET;
adev->rmmio_remap.bus_addr = adev->rmmio_base + MMIO_REG_HOLE_OFFSET;
}
adev->smc_rreg = NULL; adev->smc_rreg = NULL;
adev->smc_wreg = NULL; adev->smc_wreg = NULL;
adev->pcie_rreg = &amdgpu_device_indirect_rreg; adev->pcie_rreg = &amdgpu_device_indirect_rreg;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment