From: jsg Date: Mon, 9 Oct 2023 02:32:10 +0000 (+0000) Subject: drm/amdgpu/nbio4.3: set proper rmmio_remap.reg_offset for SR-IOV X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=00ed08228b1e0de03518c5227b8e52d899787178;p=openbsd drm/amdgpu/nbio4.3: set proper rmmio_remap.reg_offset for SR-IOV From Alex Deucher ad3c37f90bae3675bc686562f7e63511d1033cc0 in linux-6.1.y/6.1.56 ab43213e7afd08ac68d4282060bacf309e70fd14 in mainline linux --- diff --git a/sys/dev/pci/drm/amd/amdgpu/nbio_v4_3.c b/sys/dev/pci/drm/amd/amdgpu/nbio_v4_3.c index 09fdcd20cb9..c52a378396a 100644 --- a/sys/dev/pci/drm/amd/amdgpu/nbio_v4_3.c +++ b/sys/dev/pci/drm/amd/amdgpu/nbio_v4_3.c @@ -344,6 +344,9 @@ static void nbio_v4_3_init_registers(struct amdgpu_device *adev) data &= ~RCC_DEV0_EPF2_STRAP2__STRAP_NO_SOFT_RESET_DEV0_F2_MASK; WREG32_SOC15(NBIO, 0, regRCC_DEV0_EPF2_STRAP2, data); } + if (amdgpu_sriov_vf(adev)) + adev->rmmio_remap.reg_offset = SOC15_REG_OFFSET(NBIO, 0, + regBIF_BX_DEV0_EPF0_VF0_HDP_MEM_COHERENCY_FLUSH_CNTL) << 2; } static u32 nbio_v4_3_get_rom_offset(struct amdgpu_device *adev)