[2/2] drm/amdgpu/soc15: enable psp block for SRIOV

Submitted by Yu, Xiangliang on March 29, 2017, 9:26 a.m.

Details

Message ID 1490779618-24388-1-git-send-email-Xiangliang.Yu@amd.com
State New
Headers show
Series "Series without cover letter" ( rev: 1 ) in AMD X.Org drivers

Not browsing as part of any series.

Commit Message

Yu, Xiangliang March 29, 2017, 9:26 a.m.
SRIOV can support for loading ucode with PSP block, enable it.

Signed-off-by: Xiangliang Yu <Xiangliang.Yu@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/soc15.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Patch hide | download patch | download mbox

diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c
index 660b13b..9a734d4 100644
--- a/drivers/gpu/drm/amd/amdgpu/soc15.c
+++ b/drivers/gpu/drm/amd/amdgpu/soc15.c
@@ -483,10 +483,9 @@  int soc15_set_ip_blocks(struct amdgpu_device *adev)
 		amdgpu_ip_block_add(adev, &mmhub_v1_0_ip_block);
 		amdgpu_ip_block_add(adev, &gmc_v9_0_ip_block);
 		amdgpu_ip_block_add(adev, &vega10_ih_ip_block);
-		if (!amdgpu_sriov_vf(adev)) {
-			amdgpu_ip_block_add(adev, &psp_v3_1_ip_block);
+		amdgpu_ip_block_add(adev, &psp_v3_1_ip_block);
+		if (!amdgpu_sriov_vf(adev))
 			amdgpu_ip_block_add(adev, &amdgpu_pp_ip_block);
-		}
 		if (adev->enable_virtual_display || amdgpu_sriov_vf(adev))
 			amdgpu_ip_block_add(adev, &dce_virtual_ip_block);
 #if defined(CONFIG_DRM_AMD_DC)

Comments

On Wed, Mar 29, 2017 at 05:26:58PM +0800, Xiangliang Yu wrote:
> SRIOV can support for loading ucode with PSP block, enable it.
> 
> Signed-off-by: Xiangliang Yu <Xiangliang.Yu@amd.com>
> ---

I am glad to see that sriov will also use psp now.

Cheers, :-)

Both two patches are Acked-by: Huang Rui <ray.huang@amd.com>

>  drivers/gpu/drm/amd/amdgpu/soc15.c | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c
> index 660b13b..9a734d4 100644
> --- a/drivers/gpu/drm/amd/amdgpu/soc15.c
> +++ b/drivers/gpu/drm/amd/amdgpu/soc15.c
> @@ -483,10 +483,9 @@ int soc15_set_ip_blocks(struct amdgpu_device *adev)
>  		amdgpu_ip_block_add(adev, &mmhub_v1_0_ip_block);
>  		amdgpu_ip_block_add(adev, &gmc_v9_0_ip_block);
>  		amdgpu_ip_block_add(adev, &vega10_ih_ip_block);
> -		if (!amdgpu_sriov_vf(adev)) {
> -			amdgpu_ip_block_add(adev, &psp_v3_1_ip_block);
> +		amdgpu_ip_block_add(adev, &psp_v3_1_ip_block);
> +		if (!amdgpu_sriov_vf(adev))
>  			amdgpu_ip_block_add(adev, &amdgpu_pp_ip_block);
> -		}
>  		if (adev->enable_virtual_display || amdgpu_sriov_vf(adev))
>  			amdgpu_ip_block_add(adev, &dce_virtual_ip_block);
>  #if defined(CONFIG_DRM_AMD_DC)
> -- 
> 2.7.4
> 
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx