From: Ben Skeggs <bskeggs@redhat.com>
Date: Mon, 19 May 2014 04:54:33 +0000 (+1000)
Subject: drm/nv50-/kms: wait for enough ring space in crtc_prepare()
X-Git-Tag: v3.16-rc1~35^2~2^2~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=56d237d2683bc0ba403148697260dd9499c40949;p=platform%2Fkernel%2Flinux-exynos.git

drm/nv50-/kms: wait for enough ring space in crtc_prepare()

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
---

diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c
index 79f6dc7..3c58854 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);