* Re: [PATCH] drm/amdgpu:fix psp ip block patch
[not found] ` <1491463883-27444-1-git-send-email-Monk.Liu-5C7GfCeVMHo@public.gmane.org>
@ 2017-04-06 10:04 ` Christian König
2017-04-06 14:22 ` Deucher, Alexander
2017-04-07 2:01 ` Zhang, Jerry (Junwei)
2 siblings, 0 replies; 4+ messages in thread
From: Christian König @ 2017-04-06 10:04 UTC (permalink / raw)
To: Monk Liu, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
Am 06.04.2017 um 09:31 schrieb Monk Liu:
> should use kernel parm to judge instead of adev member,
> which hasn't been set at that time
>
> Change-Id: I58c83a8615cd4a54440c9de038e45bb70802cc2c
> Signed-off-by: Monk Liu <Monk.Liu@amd.com>
Tested-and-reviewed-by: Christian König <christian.koenig@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/soc15.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c
> index 35db2c7..aba1c16 100644
> --- a/drivers/gpu/drm/amd/amdgpu/soc15.c
> +++ b/drivers/gpu/drm/amd/amdgpu/soc15.c
> @@ -497,7 +497,7 @@ 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 (adev->firmware.load_type == AMDGPU_FW_LOAD_PSP)
> + if (amdgpu_fw_load_type == 2 || amdgpu_fw_load_type == -1)
> amdgpu_ip_block_add(adev, &psp_v3_1_ip_block);
> if (!amdgpu_sriov_vf(adev))
> amdgpu_ip_block_add(adev, &amdgpu_pp_ip_block);
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread* RE: [PATCH] drm/amdgpu:fix psp ip block patch
[not found] ` <1491463883-27444-1-git-send-email-Monk.Liu-5C7GfCeVMHo@public.gmane.org>
2017-04-06 10:04 ` Christian König
@ 2017-04-06 14:22 ` Deucher, Alexander
2017-04-07 2:01 ` Zhang, Jerry (Junwei)
2 siblings, 0 replies; 4+ messages in thread
From: Deucher, Alexander @ 2017-04-06 14:22 UTC (permalink / raw)
To: amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW; +Cc: Liu, Monk
> -----Original Message-----
> From: amd-gfx [mailto:amd-gfx-bounces@lists.freedesktop.org] On Behalf
> Of Monk Liu
> Sent: Thursday, April 06, 2017 3:31 AM
> To: amd-gfx@lists.freedesktop.org
> Cc: Liu, Monk
> Subject: [PATCH] drm/amdgpu:fix psp ip block patch
>
> should use kernel parm to judge instead of adev member,
> which hasn't been set at that time
>
> Change-Id: I58c83a8615cd4a54440c9de038e45bb70802cc2c
> Signed-off-by: Monk Liu <Monk.Liu@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/soc15.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c
> b/drivers/gpu/drm/amd/amdgpu/soc15.c
> index 35db2c7..aba1c16 100644
> --- a/drivers/gpu/drm/amd/amdgpu/soc15.c
> +++ b/drivers/gpu/drm/amd/amdgpu/soc15.c
> @@ -497,7 +497,7 @@ 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 (adev->firmware.load_type == AMDGPU_FW_LOAD_PSP)
> + if (amdgpu_fw_load_type == 2 || amdgpu_fw_load_type ==
> -1)
> amdgpu_ip_block_add(adev, &psp_v3_1_ip_block);
> if (!amdgpu_sriov_vf(adev))
> amdgpu_ip_block_add(adev,
> &amdgpu_pp_ip_block);
> --
> 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
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] drm/amdgpu:fix psp ip block patch
[not found] ` <1491463883-27444-1-git-send-email-Monk.Liu-5C7GfCeVMHo@public.gmane.org>
2017-04-06 10:04 ` Christian König
2017-04-06 14:22 ` Deucher, Alexander
@ 2017-04-07 2:01 ` Zhang, Jerry (Junwei)
2 siblings, 0 replies; 4+ messages in thread
From: Zhang, Jerry (Junwei) @ 2017-04-07 2:01 UTC (permalink / raw)
To: Monk Liu, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW
On 04/06/2017 03:31 PM, Monk Liu wrote:
> should use kernel parm to judge instead of adev member,
> which hasn't been set at that time
>
> Change-Id: I58c83a8615cd4a54440c9de038e45bb70802cc2c
> Signed-off-by: Monk Liu <Monk.Liu@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/soc15.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c
> index 35db2c7..aba1c16 100644
> --- a/drivers/gpu/drm/amd/amdgpu/soc15.c
> +++ b/drivers/gpu/drm/amd/amdgpu/soc15.c
> @@ -497,7 +497,7 @@ 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 (adev->firmware.load_type == AMDGPU_FW_LOAD_PSP)
> + if (amdgpu_fw_load_type == 2 || amdgpu_fw_load_type == -1)
It's better to use the name of enumeration "AMDGPU_FW_LOAD_PSP" for clear meaning.
With that fix,
Reviewed-by: Junwei Zhang <Jerry.Zhang@amd.com>
> amdgpu_ip_block_add(adev, &psp_v3_1_ip_block);
> if (!amdgpu_sriov_vf(adev))
> amdgpu_ip_block_add(adev, &amdgpu_pp_ip_block);
>
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread