---

yaml --- r: 250622 b: refs/heads/master c: 51d5612 h: refs/heads/master v: v3
git-mirror · May 14, 2011 · e6c10b3 · e6c10b3
1 parent bade723
commit e6c10b3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b1f14ad01ab09f5e22fb1240a6a158a23527ff14
+refs/heads/master: 51d56126a25280c2dfca6bd7f68a4e8183b679b1
diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/drivers/gpu/drm/i915/intel_display.c
@@ -6431,6 +6431,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
 		break;
 
 	case 6:
+	case 7:
 		OUT_RING(MI_DISPLAY_FLIP |
 			 MI_DISPLAY_FLIP_PLANE(intel_crtc->plane));
 		OUT_RING(fb->pitch | obj->tiling_mode);
-Original file line number
+Diff line change
@@ Expand Up / @@ -6431,6 +6431,7 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc, @@
     		break;
     	case 6:
+    	case 7:
     		OUT_RING(MI_DISPLAY_FLIP |
     			 MI_DISPLAY_FLIP_PLANE(intel_crtc->plane));
     		OUT_RING(fb->pitch | obj->tiling_mode);
@@ Expand Down @@