p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

drm/msm/atomic: fix issue with gnome-shell wayland 

The gnome-shell wayland compositor triggers a setcrtc with an fb that is
still being rendered, triggering the call to _wait_fence_interruptable().
But a NULL timeout means "don't wait, return -EBUSY if not ready", which
in turn causes the setcrtc to fail.

Signed-off-by: Rob Clark <robdclark@gmail.com>
This commit is contained in:
Rob Clark 2015-01-12 16:11:16 -05:00
parent e172d10a9c
commit be7a7b8997
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/gpu/drm/msm/msm_atomic.c
View File

@ -178,6 +178,7 @@ int msm_atomic_commit(struct drm_device *dev,
{
int nplanes = dev->mode_config.num_total_plane;
int ncrtcs = dev->mode_config.num_crtc;
struct timespec timeout;
struct msm_commit *c;
int i, ret;
@ -250,7 +251,9 @@ int msm_atomic_commit(struct drm_device *dev,
return 0;
}
ret = msm_wait_fence_interruptable(dev, c->fence, NULL);
jiffies_to_timespec(jiffies + msecs_to_jiffies(1000), &timeout);
ret = msm_wait_fence_interruptable(dev, c->fence, &timeout);
if (ret) {
WARN_ON(ret); // TODO unswap state back? or??
commit_destroy(c);