diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2014-05-19 14:54:33 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2014-06-10 16:05:52 +1000 |
| commit | 56d237d2683bc0ba403148697260dd9499c40949 (patch) | |
| tree | 2472c572ba66af13843d198bddb41675325aad64 /drivers/gpu/drm/nouveau/nv50_display.c | |
| parent | 6e8e268bacb223636f3ade132330b75b70d0f0bf (diff) | |
| download | linux-56d237d2683bc0ba403148697260dd9499c40949.tar.gz linux-56d237d2683bc0ba403148697260dd9499c40949.tar.bz2 linux-56d237d2683bc0ba403148697260dd9499c40949.zip | |
drm/nv50-/kms: wait for enough ring space in crtc_prepare()
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nv50_display.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nv50_display.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c index 79f6dc724a85..3c58854aff03 100644 --- a/drivers/gpu/drm/nouveau/nv50_display.c +++ b/drivers/gpu/drm/nouveau/nv50_display.c @@ -1,4 +1,4 @@ - /* +/* * Copyright 2011 Red Hat Inc. * * Permission is hereby granted, free of charge, to any person obtaining a @@ -957,7 +957,7 @@ nv50_crtc_prepare(struct drm_crtc *crtc) nv50_display_flip_stop(crtc); - push = evo_wait(mast, 2); + push = evo_wait(mast, 6); if (push) { if (nv50_vers(mast) < NV84_DISP_MAST_CLASS) { evo_mthd(push, 0x0874 + (nv_crtc->index * 0x400), 1); |