On Sat, Sep 30, 2017 at 11:14:42AM -0400, Ed Tomlinson wrote:
> Hi
>
> I did things old school via patch -R. This is what I reverted:
>
> ---
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> index 4083be61b328..6417febe18b9 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> @@ -95,9 +95,8 @@ int psp_wait_for(struct psp_context *psp, uint32_t
> reg_index,
> int i;
> struct amdgpu_device *adev = psp->adev;
>
> - val = RREG32(reg_index);
> -
> for (i = 0; i < adev->usec_timeout; i++) {
> + val = RREG32(reg_index);
> if (check_changed) {
> if (val != reg_val)
> return 0;
> diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c
> b/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c
> index c98d77d0c8f8..6f80ad8f588b 100644
> --- a/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c
> +++ b/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c
> @@ -237,11 +237,9 @@ int psp_v3_1_bootloader_load_sos(struct psp_context
> *psp)
>
> /* there might be handshake issue with hardware which needs delay */
> mdelay(20);
> -#if 0
> ret = psp_wait_for(psp, SOC15_REG_OFFSET(MP0, 0,
> mmMP0_SMN_C2PMSG_81),
> RREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_81),
> 0, true);
> -#endif
>
> return ret;
> }
> ---
Any chance to dig out _which_ patch this was? I don't have access to my
tree at the moment...
And what about 4.14-rc2?
thanks,
greg k-h