Reviewed-by: James Zhu <James.Zhu at amd.com>
On 2018-05-17 06:36 PM, Alex Deucher wrote:
> Take the encode rings into account in the idle work handler.
>
> v2: fix typo: s/num_uvd_inst/num_enc_rings/
>
> Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
> index be2917c6698e..bcf68f80bbf0 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
> @@ -1146,10 +1146,13 @@ static void amdgpu_uvd_idle_work_handler(struct work_struct *work)
> {
> struct amdgpu_device *adev =
> container_of(work, struct amdgpu_device, uvd.inst->idle_work.work);
> - unsigned fences = 0, i;
> + unsigned fences = 0, i, j;
>
> for (i = 0; i < adev->uvd.num_uvd_inst; ++i) {
> fences += amdgpu_fence_count_emitted(&adev->uvd.inst[i].ring);
> + for (j = 0; j < adev->uvd.num_enc_rings; ++j) {
> + fences += amdgpu_fence_count_emitted(&adev->uvd.inst[i].ring_enc[j]);
> + }
> }
>
> if (fences == 0) {
