diff options
| author | Maarten Lankhorst <maarten.lankhorst@canonical.com> | 2013-07-07 08:53:37 (GMT) |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2013-07-10 00:48:00 (GMT) |
| commit | 06b237ef3903a0a5e33785105ea5203153323dd8 (patch) | |
| tree | e64881c3046c4df6735fdb4fba9a6df2d822feb8 /drivers/gpu/drm/nouveau | |
| parent | 4f3855997c5d2bf6443853800eb1a03f61ad9140 (diff) | |
| download | linux-fsl-qoriq-06b237ef3903a0a5e33785105ea5203153323dd8.tar.xz | |
drm/nouveau: bump fence timeout to 15 seconds
calim didn't like 150 seconds timeout, so lower the timeout for him.
15 seconds should still be plenty.
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_fence.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_fence.c b/drivers/gpu/drm/nouveau/nouveau_fence.c index 1680d91..be31499 100644 --- a/drivers/gpu/drm/nouveau/nouveau_fence.c +++ b/drivers/gpu/drm/nouveau/nouveau_fence.c @@ -143,7 +143,7 @@ nouveau_fence_emit(struct nouveau_fence *fence, struct nouveau_channel *chan) int ret; fence->channel = chan; - fence->timeout = jiffies + (3 * DRM_HZ); + fence->timeout = jiffies + (15 * DRM_HZ); fence->sequence = ++fctx->sequence; ret = fctx->emit(fence); |