From bdfaee8bbce23f190356adf060677173e473f233 Mon Sep 17 00:00:00 2001
From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Tue, 10 Jul 2012 18:11:08 +0200
Subject: [PATCH] --- yaml --- r: 329437 b: refs/heads/master c:
 835c5873d6e38cb317091ace7c1f3c40cc0607ce h: refs/heads/master i:   329435:
 c6ed2d1570bddc532f508597766cbe575058feaa v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/gpu/drm/i915/intel_display.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 27dd8737f054..9623dbddcfca 100644
--- 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
index 71cb90d763bd..01d871b16f62 100644
--- 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)) {