Hi Rex, I think still initializing the PSP even when you don't need it for firmware upload sounds like a good idea to me. But take that with a grain of salt since I really on don't know that part of the hardware so well. Christian. Am 09.03.2018 um 06:10 schrieb Zhu, Rex: > > Hi Alex, > > > How about keep the firmware type checking in set_ip_blocks. > > and remove the same check code in psp module. > > also no need to change load type if psp load firmware failed in psp > module. > > > Please review the attached patch. > > > Best Regards > > Rex > > ------------------------------------------------------------------------ > *From:* amd-gfx <amd-gfx-bounces at lists.freedesktop.org> on behalf of > Alex Deucher <alexdeucher at gmail.com> > *Sent:* Friday, March 9, 2018 4:54 AM > *To:* amd-gfx at lists.freedesktop.org > *Cc:* Deucher, Alexander > *Subject:* [PATCH 2/2] drm/amdgpu/soc15: always load the psp IP module > We already handle the firmware loading type checks in the > psp module directly, no need for an additional check. > > Signed-off-by: Alex Deucher <alexander.deucher at amd.com> > --- > Â drivers/gpu/drm/amd/amdgpu/soc15.c | 3 +-- > Â 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c > b/drivers/gpu/drm/amd/amdgpu/soc15.c > index 8dc8b72ed49b..ecf58a68cf66 100644 > --- a/drivers/gpu/drm/amd/amdgpu/soc15.c > +++ b/drivers/gpu/drm/amd/amdgpu/soc15.c > @@ -531,8 +531,7 @@ int soc15_set_ip_blocks(struct amdgpu_device *adev) > Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â amdgpu_device_ip_block_add(adev, > &vega10_common_ip_block); > Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â amdgpu_device_ip_block_add(adev, &gmc_v9_0_ip_block); > Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â amdgpu_device_ip_block_add(adev, &vega10_ih_ip_block); > -Â Â Â Â Â Â Â Â Â Â Â Â Â Â if (amdgpu_fw_load_type == 2 || amdgpu_fw_load_type == -1) > - amdgpu_device_ip_block_add(adev, &psp_v3_1_ip_block); > +Â Â Â Â Â Â Â Â Â Â Â Â Â Â amdgpu_device_ip_block_add(adev, &psp_v3_1_ip_block); > Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â if (!amdgpu_sriov_vf(adev)) > amdgpu_device_ip_block_add(adev, &amdgpu_pp_ip_block); > Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â if (adev->enable_virtual_display || > amdgpu_sriov_vf(adev)) > -- > 2.13.6 > > _______________________________________________ > amd-gfx mailing list > amd-gfx at lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/amd-gfx > amd-gfx Info Page - freedesktop.org > <https://lists.freedesktop.org/mailman/listinfo/amd-gfx> > lists.freedesktop.org > Subscribing to amd-gfx: Subscribe to amd-gfx by filling out the > following form. Use of all freedesktop.org lists is subject to our > Code of ... > > > > > _______________________________________________ > amd-gfx mailing list > amd-gfx at lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/amd-gfx -------------- next part -------------- An HTML attachment was scrubbed... URL: <https://lists.freedesktop.org/archives/amd-gfx/attachments/20180309/6d28fa73/attachment.html>
