[PATCH] drm/amdgpu:bypass avfs event manager for sriov

[PATCH] drm/amdgpu:bypass avfs event manager for sriov

[Trigger Huang]

This patch is used for virtualization support. In virtualization case,
the initialization sequences are not totally the same as
non-Virtualization's. The avfs event manager should be bypassed if in
SRIOV virtualization case.

Signed-off-by: Frank Min <Frank.Min@amd.com>
Signed-off-by: Xiangliang Yu <Xiangliang.Yu@amd.com>
Signed-off-by: Trigger Huang <trigger.huang@amd.com>
---
 drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c
index b86e48f..26eff56 100755
--- a/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c
+++ b/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c
@@ -396,7 +396,8 @@ static int fiji_start_smu(struct pp_smumgr *smumgr)
 	struct fiji_smumgr *priv = (struct fiji_smumgr *)(smumgr->backend);
 
 	/* Only start SMC if SMC RAM is not running */
-	if (!smu7_is_smc_ram_running(smumgr)) {
+	if (!(smu7_is_smc_ram_running(smumgr)
+		|| cgs_is_virtualization_enabled(smumgr->device))) {
 		fiji_avfs_event_mgr(smumgr, false);
 
 		/* Check if SMU is running in protected mode */
@@ -443,6 +444,9 @@ static bool fiji_is_hw_avfs_present(struct pp_smumgr *smumgr)
 	uint32_t efuse = 0;
 	uint32_t mask = (1 << ((AVFS_EN_MSB - AVFS_EN_LSB) + 1)) - 1;
 
+	if (cgs_is_virtualization_enabled(smumgr->device))
+		return 0;
+
 	if (!atomctrl_read_efuse(smumgr->device, AVFS_EN_LSB, AVFS_EN_MSB,
 			mask, &efuse)) {
 		if (efuse)
-- 
2.7.4

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

RE: [PATCH] drm/amdgpu:bypass avfs event manager for sriov

[Deucher, Alexander]

> -----Original Message-----
> From: amd-gfx [mailto:amd-gfx-bounces@lists.freedesktop.org] On Behalf
> Of Trigger Huang
> Sent: Tuesday, November 01, 2016 3:23 AM
> To: amd-gfx@lists.freedesktop.org
> Cc: Min, Frank; Yu, Xiangliang; Liu, Monk; Huang, Trigger
> Subject: [PATCH] drm/amdgpu:bypass avfs event manager for sriov
> 
> This patch is used for virtualization support. In virtualization case,
> the initialization sequences are not totally the same as
> non-Virtualization's. The avfs event manager should be bypassed if in
> SRIOV virtualization case.
> 
> Signed-off-by: Frank Min <Frank.Min@amd.com>
> Signed-off-by: Xiangliang Yu <Xiangliang.Yu@amd.com>
> Signed-off-by: Trigger Huang <trigger.huang@amd.com>

Doesn't tonga need something similar?

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>

> ---
>  drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c
> b/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c
> index b86e48f..26eff56 100755
> --- a/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c
> +++ b/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c
> @@ -396,7 +396,8 @@ static int fiji_start_smu(struct pp_smumgr *smumgr)
>  	struct fiji_smumgr *priv = (struct fiji_smumgr *)(smumgr->backend);
> 
>  	/* Only start SMC if SMC RAM is not running */
> -	if (!smu7_is_smc_ram_running(smumgr)) {
> +	if (!(smu7_is_smc_ram_running(smumgr)
> +		|| cgs_is_virtualization_enabled(smumgr->device))) {
>  		fiji_avfs_event_mgr(smumgr, false);
> 
>  		/* Check if SMU is running in protected mode */
> @@ -443,6 +444,9 @@ static bool fiji_is_hw_avfs_present(struct
> pp_smumgr *smumgr)
>  	uint32_t efuse = 0;
>  	uint32_t mask = (1 << ((AVFS_EN_MSB - AVFS_EN_LSB) + 1)) - 1;
> 
> +	if (cgs_is_virtualization_enabled(smumgr->device))
> +		return 0;
> +
>  	if (!atomctrl_read_efuse(smumgr->device, AVFS_EN_LSB,
> AVFS_EN_MSB,
>  			mask, &efuse)) {
>  		if (efuse)
> --
> 2.7.4
> 
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

RE: [PATCH] drm/amdgpu:bypass avfs event manager for sriov

[Liu, Monk]

Tonga have no avfs event manager,

Trigger, please take care and double check you didn't lost tonga's patch, we are more concern if Tonga could support SRIOV than FIJI

BR Monk

-----Original Message-----
From: Deucher, Alexander 
Sent: Tuesday, November 01, 2016 11:18 PM
To: Huang, Trigger <Trigger.Huang@amd.com>; amd-gfx@lists.freedesktop.org
Cc: Min, Frank <Frank.Min@amd.com>; Yu, Xiangliang <Xiangliang.Yu@amd.com>; Liu, Monk <Monk.Liu@amd.com>; Huang, Trigger <Trigger.Huang@amd.com>
Subject: RE: [PATCH] drm/amdgpu:bypass avfs event manager for sriov

> -----Original Message-----
> From: amd-gfx [mailto:amd-gfx-bounces@lists.freedesktop.org] On Behalf 
> Of Trigger Huang
> Sent: Tuesday, November 01, 2016 3:23 AM
> To: amd-gfx@lists.freedesktop.org
> Cc: Min, Frank; Yu, Xiangliang; Liu, Monk; Huang, Trigger
> Subject: [PATCH] drm/amdgpu:bypass avfs event manager for sriov
> 
> This patch is used for virtualization support. In virtualization case, 
> the initialization sequences are not totally the same as 
> non-Virtualization's. The avfs event manager should be bypassed if in 
> SRIOV virtualization case.
> 
> Signed-off-by: Frank Min <Frank.Min@amd.com>
> Signed-off-by: Xiangliang Yu <Xiangliang.Yu@amd.com>
> Signed-off-by: Trigger Huang <trigger.huang@amd.com>

Doesn't tonga need something similar?

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>

> ---
>  drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c
> b/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c
> index b86e48f..26eff56 100755
> --- a/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c
> +++ b/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c
> @@ -396,7 +396,8 @@ static int fiji_start_smu(struct pp_smumgr *smumgr)
>  	struct fiji_smumgr *priv = (struct fiji_smumgr *)(smumgr->backend);
> 
>  	/* Only start SMC if SMC RAM is not running */
> -	if (!smu7_is_smc_ram_running(smumgr)) {
> +	if (!(smu7_is_smc_ram_running(smumgr)
> +		|| cgs_is_virtualization_enabled(smumgr->device))) {
>  		fiji_avfs_event_mgr(smumgr, false);
> 
>  		/* Check if SMU is running in protected mode */ @@ -443,6 +444,9 @@ 
> static bool fiji_is_hw_avfs_present(struct pp_smumgr *smumgr)
>  	uint32_t efuse = 0;
>  	uint32_t mask = (1 << ((AVFS_EN_MSB - AVFS_EN_LSB) + 1)) - 1;
> 
> +	if (cgs_is_virtualization_enabled(smumgr->device))
> +		return 0;
> +
>  	if (!atomctrl_read_efuse(smumgr->device, AVFS_EN_LSB, AVFS_EN_MSB,
>  			mask, &efuse)) {
>  		if (efuse)
> --
> 2.7.4
> 
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx