[git,pull] drm intel only fixes

Commit Message

Linus Torvalds Jan. 12, 2011, 8:27 p.m. UTC

None

Patch

 drivers/gpu/drm/i915/intel_display.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 25d9688..2ea1a51 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -3445,6 +3445,7 @@  static bool ironlake_compute_wm0(struct drm_device *dev,
 		entries += tlb_miss;
 	entries = DIV_ROUND_UP(entries, display->cacheline_size);
 	*plane_wm = entries + display->guard_size;
+*plane_wm *=2;
 	if (*plane_wm > (int)display->max_wm)
 		*plane_wm = display->max_wm;
 
@@ -3457,6 +3458,7 @@  static bool ironlake_compute_wm0(struct drm_device *dev,
 		entries += tlb_miss;
 	entries = DIV_ROUND_UP(entries, cursor->cacheline_size);
 	*cursor_wm = entries + cursor->guard_size;
+*cursor_wm *= 2;
 	if (*cursor_wm > (int)cursor->max_wm)
 		*cursor_wm = (int)cursor->max_wm;
 
@@ -3607,6 +3609,8 @@  static void ironlake_update_wm(struct drm_device *dev,
 	if (enabled != 1)
 		return;
 
+return;
+
 	clock = planea_clock ? planea_clock : planeb_clock;
 
 	/* WM1 */