---

yaml --- r: 288082 b: refs/heads/master c: 4e9bb47 h: refs/heads/master v: v3
git-mirror · Feb 23, 2012 · 43d2d5f · 43d2d5f
1 parent 3283977
commit 43d2d5f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5ca0c34ae28344b6b4ca3036bc82f89c8db16a59
+refs/heads/master: 4e9bb47bd29e02f2daaa7bdb2a8ddf977bf76f06
diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/drivers/gpu/drm/i915/intel_display.c
@@ -4680,8 +4680,17 @@ sandybridge_compute_sprite_srwm(struct drm_device *dev, int plane,
 
 	crtc = intel_get_crtc_for_plane(dev, plane);
 	clock = crtc->mode.clock;
+	if (!clock) {
+		*sprite_wm = 0;
+		return false;
+	}
 
 	line_time_us = (sprite_width * 1000) / clock;
+	if (!line_time_us) {
+		*sprite_wm = 0;
+		return false;
+	}
+
 	line_count = (latency_ns / line_time_us + 1000) / 1000;
 	line_size = sprite_width * pixel_size;