Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm/amdgpu/nv: use common nbio callback to set remap offset
This fixes HDP flushes on systems with non-4K pages.
Reviewed-by: Felix Kuehling <felix.kuehling@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+1
-13
-4
drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c
-4
drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c
···
339
339
340
340
if (def != data)
341
341
WREG32_PCIE(smnPCIE_CONFIG_CNTL, data);
342
-
343
-
if (amdgpu_sriov_vf(adev))
344
-
adev->rmmio_remap.reg_offset = SOC15_REG_OFFSET(NBIO, 0,
345
-
mmBIF_BX_DEV0_EPF0_VF0_HDP_MEM_COHERENCY_FLUSH_CNTL) << 2;
346
342
}
347
343
348
344
#define NAVI10_PCIE__LC_L0S_INACTIVITY_DEFAULT 0x00000000 // off by default, no gains over L1
-4
drivers/gpu/drm/amd/amdgpu/nbio_v7_2.c
-4
drivers/gpu/drm/amd/amdgpu/nbio_v7_2.c
···
402
402
WREG32_SOC15(NBIO, 0, regRCC_DEV2_EPF0_STRAP2, data);
403
403
break;
404
404
}
405
-
406
-
if (amdgpu_sriov_vf(adev))
407
-
adev->rmmio_remap.reg_offset = SOC15_REG_OFFSET(NBIO, 0,
408
-
regBIF_BX_PF0_HDP_MEM_COHERENCY_FLUSH_CNTL) << 2;
409
405
}
410
406
411
407
#define MMIO_REG_HOLE_OFFSET (0x80000 - PAGE_SIZE)
+1
-5
drivers/gpu/drm/amd/amdgpu/nv.c
+1
-5
drivers/gpu/drm/amd/amdgpu/nv.c
···
637
637
638
638
static int nv_common_early_init(void *handle)
639
639
{
640
-
#define MMIO_REG_HOLE_OFFSET (0x80000 - PAGE_SIZE)
641
640
struct amdgpu_device *adev = (struct amdgpu_device *)handle;
642
641
643
-
if (!amdgpu_sriov_vf(adev)) {
644
-
adev->rmmio_remap.reg_offset = MMIO_REG_HOLE_OFFSET;
645
-
adev->rmmio_remap.bus_addr = adev->rmmio_base + MMIO_REG_HOLE_OFFSET;
646
-
}
642
+
adev->nbio.funcs->set_reg_remap(adev);
647
643
adev->smc_rreg = NULL;
648
644
adev->smc_wreg = NULL;
649
645
adev->pcie_rreg = &amdgpu_device_indirect_rreg;