---

yaml --- r: 329437 b: refs/heads/master c: 835c587 h: refs/heads/master i: 329435: c6ed2d1 v: v3
git-mirror · Sep 6, 2012 · bdfaee8 · bdfaee8
1 parent c302540
commit bdfaee8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 431e50f799b356a899a63924883f2b0d1bfaf7b3
+refs/heads/master: 835c5873d6e38cb317091ace7c1f3c40cc0607ce
diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/drivers/gpu/drm/i915/intel_display.c
@@ -6828,7 +6828,7 @@ intel_set_config_compute_mode_changes(struct drm_mode_set *set,
 			config->fb_changed = true;
 	}
 
-	if (set->x != set->crtc->x || set->y != set->crtc->y)
+	if (set->fb && (set->x != set->crtc->x || set->y != set->crtc->y))
 		config->fb_changed = true;
 
 	if (set->mode && !drm_mode_equal(set->mode, &set->crtc->mode)) {