From: "Liu, Shaoyun" <Shaoyun.Liu@amd.com>
To: "Luo, Zhigang" <Zhigang.Luo@amd.com>,
"amd-gfx@lists.freedesktop.org" <amd-gfx@lists.freedesktop.org>
Cc: "Luo, Zhigang" <Zhigang.Luo@amd.com>
Subject: RE: [PATCH 3/5] drm/amdgpu: remove sriov vf mmhub system aperture and fb location programming
Date: Thu, 3 Jun 2021 15:11:36 +0000 [thread overview]
Message-ID: <DM6PR12MB55342CC0790CF1C7DB620CBDF43C9@DM6PR12MB5534.namprd12.prod.outlook.com> (raw)
In-Reply-To: <20210603141305.2542-3-zhigang.luo@amd.com>
[AMD Official Use Only]
Looks ok to me .
-----Original Message-----
From: amd-gfx <amd-gfx-bounces@lists.freedesktop.org> On Behalf Of Zhigang Luo
Sent: Thursday, June 3, 2021 10:13 AM
To: amd-gfx@lists.freedesktop.org
Cc: Luo, Zhigang <Zhigang.Luo@amd.com>
Subject: [PATCH 3/5] drm/amdgpu: remove sriov vf mmhub system aperture and fb location programming
host driver programmed mmhub system aperture and fb location for vf, no need to program in guest side.
Signed-off-by: Zhigang Luo <zhigang.luo@amd.com>
---
drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c | 17 +++--------------
1 file changed, 3 insertions(+), 14 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c b/drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c
index 998e674f9369..f5f7181f9af5 100644
--- a/drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c
+++ b/drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c
@@ -111,6 +111,9 @@ static void mmhub_v1_7_init_system_aperture_regs(struct amdgpu_device *adev)
WREG32_SOC15(MMHUB, 0, regMC_VM_AGP_BOT, adev->gmc.agp_start >> 24);
WREG32_SOC15(MMHUB, 0, regMC_VM_AGP_TOP, adev->gmc.agp_end >> 24);
+ if (amdgpu_sriov_vf(adev))
+ return;
+
/* Program the system aperture low logical page number. */
WREG32_SOC15(MMHUB, 0, regMC_VM_SYSTEM_APERTURE_LOW_ADDR,
min(adev->gmc.fb_start, adev->gmc.agp_start) >> 18); @@ -129,8 +132,6 @@ static void mmhub_v1_7_init_system_aperture_regs(struct amdgpu_device *adev)
WREG32_SOC15(MMHUB, 0, regMC_VM_SYSTEM_APERTURE_LOW_ADDR, 0x3FFFFFFF);
WREG32_SOC15(MMHUB, 0, regMC_VM_SYSTEM_APERTURE_HIGH_ADDR, 0);
}
- if (amdgpu_sriov_vf(adev))
- return;
/* Set default page address. */
value = amdgpu_gmc_vram_mc2pa(adev, adev->vram_scratch.gpu_addr); @@ -331,18 +332,6 @@ static void mmhub_v1_7_program_invalidation(struct amdgpu_device *adev)
static int mmhub_v1_7_gart_enable(struct amdgpu_device *adev) {
- if (amdgpu_sriov_vf(adev)) {
- /*
- * MC_VM_FB_LOCATION_BASE/TOP is NULL for VF, becuase they are
- * VF copy registers so vbios post doesn't program them, for
- * SRIOV driver need to program them
- */
- WREG32_SOC15(MMHUB, 0, regMC_VM_FB_LOCATION_BASE,
- adev->gmc.vram_start >> 24);
- WREG32_SOC15(MMHUB, 0, regMC_VM_FB_LOCATION_TOP,
- adev->gmc.vram_end >> 24);
- }
-
/* GART Enable. */
mmhub_v1_7_init_gart_aperture_regs(adev);
mmhub_v1_7_init_system_aperture_regs(adev);
--
2.17.1
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=04%7C01%7CShaoyun.Liu%40amd.com%7Ce69db3117bd84691819308d92699c93c%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637583264214796331%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=vmZU4JdKm5wuX12YboT602UZTCGW%2BqtHEph1Dyw%2F8gY%3D&reserved=0
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
next prev parent reply other threads:[~2021-06-03 15:11 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-03 14:13 [PATCH 1/5] drm/amdgpu: remove sriov vf checking from getting fb location Zhigang Luo
2021-06-03 14:13 ` [PATCH 2/5] drm/amdgpu: remove sriov vf gfxhub fb location programming Zhigang Luo
2021-06-03 15:10 ` Liu, Shaoyun
2021-06-03 15:22 ` Luo, Zhigang
2021-06-03 14:13 ` [PATCH 3/5] drm/amdgpu: remove sriov vf mmhub system aperture and " Zhigang Luo
2021-06-03 15:11 ` Liu, Shaoyun [this message]
2021-06-03 14:13 ` [PATCH 4/5] drm/amdgpu: add psp microcode init for arcturus and aldebaran sriov vf Zhigang Luo
2021-06-03 15:12 ` Liu, Shaoyun
2021-06-03 15:31 ` Luo, Zhigang
2021-06-07 13:51 ` Zhang, Hawking
2021-06-07 13:59 ` Luo, Zhigang
2021-06-03 14:13 ` [PATCH 5/5] drm/amdgpu: allocate psp fw private buffer from VRAM for " Zhigang Luo
2021-06-03 15:14 ` Liu, Shaoyun
2021-06-03 15:47 ` Luo, Zhigang
2021-06-03 16:43 ` Liu, Shaoyun
2021-06-03 15:09 ` [PATCH 1/5] drm/amdgpu: remove sriov vf checking from getting fb location Liu, Shaoyun
2021-06-04 1:13 ` Deng, Emily
2021-06-04 11:14 ` Christian König
2021-06-04 13:23 ` Luo, Zhigang
2021-06-04 13:46 ` Christian König
2021-06-04 14:06 ` Luo, Zhigang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=DM6PR12MB55342CC0790CF1C7DB620CBDF43C9@DM6PR12MB5534.namprd12.prod.outlook.com \
--to=shaoyun.liu@amd.com \
--cc=Zhigang.Luo@amd.com \
--cc=amd-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.