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....@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.zh...@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

Reply via email to