Skip to contentSkip to conversation

drm/amdgpu:fix psp ip block patch

PATCH In review Monk Liu 4 participants 4 messages Apr 6, 2017 – Apr 7, 2017 1 message not in the archive

Subsystems (2)
lore
Share & tools
lore

Monk Liu

author
#0 lore raw

PATCH 1/1 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
---
 drivers/gpu/drm/amd/amdgpu/soc15.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/soc15.c +1 -1
index 35db2c7..aba1c16 100644
@@ -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);
Signature · 6 lines
2.7.4

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): 1491463883-27444-1-git-send-email-Monk.Liu-5C7GfCeVMHo@public.gmane.org

#2 lore raw

Am 06.04.2017 um 09:31 schrieb Monk Liu:

Quoted 5 lines

should use kernel parm to judge instead of adev member, which hasn't been set at that time

Change-Id I58c83a8615cd4a54440c9de038e45bb70802cc2c
Quoted 9 lines
---
  drivers/gpu/drm/amd/amdgpu/soc15.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/soc15.c +0 -0
index 35db2c7..aba1c16 100644

drivers/gpu/drm/amd/amdgpu/soc15.c int soc15_set_ip_blocks(struct amdgpu_device *adev) · line 503

Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/soc15.c +1 -1
@@ -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
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Reviewed-by Alex Deucher
#3 lore raw
In reply to a message not in the archive
Quoted 8 lines

-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Monk Liu
Sent: Thursday, April 06, 2017 3:31 AM
To: [email protected]
Cc: Liu, Monk
Subject: [PATCH] drm/amdgpu:fix psp ip block patch

Quoted 5 lines

should use kernel parm to judge instead of adev member, which hasn't been set at that time

Change-Id I58c83a8615cd4a54440c9de038e45bb70802cc2c
Quoted 24 lines
---
 drivers/gpu/drm/amd/amdgpu/soc15.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/soc15.c +1 -2
index 35db2c7..aba1c16 100644
@@ -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

Quoted 4 lines

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Reviewed-by Junwei Zhang
#4 lore raw
In reply to a message not in the archive
Quoted 14 lines · Monk Liu

should use kernel parm to judge instead of adev member, which hasn't been set at that time

Change-Id I58c83a8615cd4a54440c9de038e45bb70802cc2c
---
  drivers/gpu/drm/amd/amdgpu/soc15.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/soc15.c +0 -0
index 35db2c7..aba1c16 100644

drivers/gpu/drm/amd/amdgpu/soc15.c int soc15_set_ip_blocks(struct amdgpu_device *adev) · line 500

Quoted 5 lines
drivers/gpu/drm/amd/amdgpu/soc15.c +1 -1
@@ -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,

drivers/gpu/drm/amd/amdgpu/soc15.c int soc15_set_ip_blocks(struct amdgpu_device *adev) · line 503

Quoted 4 lines
drivers/gpu/drm/amd/amdgpu/soc15.c +0 -0
  			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
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx