On 10/23/2017 12:06 PM, Tom St Denis wrote:
> This diff:
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c
> b/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c
> index 71299c67c517..d4a6b97d20e7 100644
> --- a/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c
> @@ -566,7 +566,7 @@ static int uvd_v6_0_suspend(void *handle)
> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â return r;
>
> Â Â Â Â Â Â Â /* Skip this for APU for now */
> -Â Â Â Â Â Â if (!(adev->flags & AMD_IS_APU))
> +//Â Â Â Â if (!(adev->flags & AMD_IS_APU))
> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â r = amdgpu_uvd_suspend(adev);
>
> Â Â Â Â Â Â Â return r;
> @@ -578,11 +578,11 @@ static int uvd_v6_0_resume(void *handle)
> Â Â Â Â Â Â Â struct amdgpu_device *adev = (struct amdgpu_device *)handle;
>
> Â Â Â Â Â Â Â /* Skip this for APU for now */
> -Â Â Â Â Â Â if (!(adev->flags & AMD_IS_APU)) {
> +//Â Â Â Â if (!(adev->flags & AMD_IS_APU)) {
> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â r = amdgpu_uvd_resume(adev);
> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â if (r)
> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â return r;
> -Â Â Â Â Â Â }
> +//Â Â Â Â }
> Â Â Â Â Â Â Â return uvd_v6_0_hw_init(adev);
> Â }
>
>
> Seems to fix it on my Carrizo. I'm hesitant to propose this as a
> patch because I don't know why it was skipped in the first place.
IIRC, the skip was added as a workaround. And the real fix was
introduced later for dGPU by adding save and restore UVD firmware
context cache part.
That fix should apply for APU, Please feel free to send fix.
Thanks,
Leo
>
> Tom
>
> On 23/10/17 09:54 AM, Tom St Denis wrote:
>> On 23/10/17 09:27 AM, Tom St Denis wrote:
>>> Doing a suspend during playback results in the uvd not resuming when
>>> waking up with drm-next as the kernel.
>>
>> Trying with cg_mask=pg_mask=0 It hangs on decode start. I've
>> attached the readout of the ring which looks normal.
>>
>> Initially I thought maybe it's a PG related issue with suspend/resume
>> but since I can't reliably playback with PG/CG disabled I can't test
>> this theory.
>>
>> Tom
>>
>>
>> _______________________________________________
>> amd-gfx mailing list
>> amd-gfx at lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
>>
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
