|
[AMD Official Use Only]
Hi Michel,
The problem with -ERESTARTSYS is the same half-baked atomic state with modifications we made in the interrupted atomic check, is reused in the next retry and fails the atomic check. What we expect in the next retry is with the original atomic state. I am going
to dig deeper and see if at DRM side we can go back to use to the original atomic state in the retry.
Regards
Stylon Wang
MTS Software Development Eng. | AMD
O +(886)
2-3789-3667 ext. 23667 C +(886) 921-897-142 ---------------------------------------------------------------------------------------------------------------------------------- 6F, 3, YuanCyu St (NanKang Software Park) Taipei, Taiwan
From: Michel Dänzer <michel@xxxxxxxxxxx>
Sent: October 26, 2021 11:51 PM To: Wang, Chao-kai (Stylon) <Stylon.Wang@xxxxxxx>; amd-gfx@xxxxxxxxxxxxxxxxxxxxx <amd-gfx@xxxxxxxxxxxxxxxxxxxxx> Cc: Wentland, Harry <Harry.Wentland@xxxxxxx>; Siqueira, Rodrigo <Rodrigo.Siqueira@xxxxxxx>; contact@xxxxxxxxxxx <contact@xxxxxxxxxxx>; Kazlauskas, Nicholas <Nicholas.Kazlauskas@xxxxxxx> Subject: Re: [PATCH] drm/amd/display: Fix error handling on waiting for completion On 2021-10-26 13:07, Stylon Wang wrote:
> [Why] > In GNOME Settings->Display the switching from mirror mode to single display > occasionally causes wait_for_completion_interruptible_timeout() to return > -ERESTARTSYS and fails atomic check. > > [How] > Replace the call with wait_for_completion_timeout() since the waiting for > hw_done and flip_done completion doesn't need to worry about interruption > from signal. > > Signed-off-by: Stylon Wang <stylon.wang@xxxxxxx> > --- > drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > index 4cd64529b180..b8f4ff323de1 100644 > --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > @@ -9844,10 +9844,10 @@ static int do_aquire_global_lock(struct drm_device *dev, > * Make sure all pending HW programming completed and > * page flips done > */ > - ret = wait_for_completion_interruptible_timeout(&commit->hw_done, 10*HZ); > + ret = wait_for_completion_timeout(&commit->hw_done, 10*HZ); > > if (ret > 0) > - ret = wait_for_completion_interruptible_timeout( > + ret = wait_for_completion_timeout( > &commit->flip_done, 10*HZ); > > if (ret == 0) > The *_interruptible_* variant is needed so that the display manager process can be killed while it's waiting here, which could take up to 10 seconds (per the timeout). What's the problem with -ERESTARTSYS? Either the ioctl should be restarted automatically, or if it bounces back to user space, that needs to be able to retry the ioctl while it returns -1 and errno == EINTR. drmIoctl handles this transparently. -- Earthling Michel Dänzer | https://nam11.safelinks.protection.outlook.com/?url=""> Libre software enthusiast | Mesa and Xwayland developer |
