Skip to contentSkip to conversation

drm/amdgpu: set firmware loading type as direct by default for raven

PATCH In review Huang Rui 2 participants 4 messages Jul 4, 2017 2 messages not in the archive

Subsystems (2)
lore
Share & tools
lore

Huang Rui

author
#0 lore raw

PATCH 1/1 drm/amdgpu: set firmware loading type as direct by default for raven

In previous case, driver can't enable psp via the kernel parameter for raven. We should open this path and set it as direct by default till psp firmware loading is workable.

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c +1 -5
index 17a935d..fcfb9d4 100644
@@ -275,14 +275,10 @@ amdgpu_ucode_get_load_type(struct amdgpu_device *adev, int load_type)
 		else
 			return AMDGPU_FW_LOAD_PSP;
 	case CHIP_RAVEN:
-#if 0
-		if (!load_type)
+		if (load_type != 2)
 			return AMDGPU_FW_LOAD_DIRECT;
 		else
 			return AMDGPU_FW_LOAD_PSP;
-#else
-		return AMDGPU_FW_LOAD_DIRECT;
-#endif
 	default:
 		DRM_ERROR("Unknow firmware load type\n");
 	}
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): 1499157314-28393-1-git-send-email-ray.huang-5C7GfCeVMHo@public.gmane.org

#2 lore raw

Hi Ray,

Thanks for your initial patch to enable PSP option for Raven.

To simplify it, we may leverage VEGA10 case for Raven directly. And remove all Raven existing code under "case CHIP_RAVEN" How do you think about it?

Jerry

Quoted 20 lines · Huang Rui

In previous case, driver can't enable psp via the kernel parameter for raven. We should open this path and set it as direct by default till psp firmware loading is workable.

---
  drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 6 +-----
  1 file changed, 1 insertion(+), 5 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c +0 -2
index 17a935d..fcfb9d4 100644
@@ -275,14 +275,10 @@ amdgpu_ucode_get_load_type(struct amdgpu_device *adev, int load_type)
  		else
  			return AMDGPU_FW_LOAD_PSP;
  	case CHIP_RAVEN:
-#if 0
-		if (!load_type)

drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c amdgpu_ucode_get_load_type(struct amdgpu_device *adev, int load_type) · line 284

Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c +1 -3
+		if (load_type != 2)
  			return AMDGPU_FW_LOAD_DIRECT;
  		else
  			return AMDGPU_FW_LOAD_PSP;
-#else
-		return AMDGPU_FW_LOAD_DIRECT;
-#endif
  	default:
  		DRM_ERROR("Unknow firmware load type\n");
  	}

_______________________________________________
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): [email protected]

author
#4 lore raw
Quoted 8 lines · Jerry

Hi Ray,

Thanks for your initial patch to enable PSP option for Raven.

To simplify it, we may leverage VEGA10 case for Raven directly. And remove all Raven existing code under "case CHIP_RAVEN" How do you think about it?

Probably not. Vega10 enabled psp fw loading by default, but not for raven.

My mainly idea here is

default:
modprobe amdgpu -> use direct fw loading.

debugging psp:
modprobe amdgpu fw_load_type=2 -> use psp fw loading.

It doesn't impact other guys use and we can debug it more smoothly. :-)

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

Reviewed-by Junwei Zhang
#5 lore raw
Quoted 14 lines · Huang Rui
Quoted 8 lines · Jerry

Hi Ray,

Thanks for your initial patch to enable PSP option for Raven.

To simplify it, we may leverage VEGA10 case for Raven directly. And remove all Raven existing code under "case CHIP_RAVEN" How do you think about it?

Probably not. Vega10 enabled psp fw loading by default, but not for raven.

My mainly idea here is

Quoted 7 lines

default:
modprobe amdgpu -> use direct fw loading.

debugging psp:
modprobe amdgpu fw_load_type=2 -> use psp fw loading.

It doesn't impact other guys use and we can debug it more smoothly. :-)

Thanks to explain it in detail.
Got it.

Feel free to add my RB and we can improve it when everything is settled down.

Quoted 4 lines

Thanks,
Ray

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