From b68f8dd57abf6d2db83958bca5cb5cfb3d4e66cc Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Thu, 12 Aug 2010 09:35:00 +0100
Subject: [PATCH] --- yaml --- r: 217915 b: refs/heads/master c:
 0ddc1289f3ffd779779ddd3922f26ae7d0a21604 h: refs/heads/master i:   217913:
 cd41d1df3227739e43e0aeccbcff4a7fb468766b   217911:
 a5fc4e00325e97d6a842b1abce8e99120e429b2d v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/gpu/drm/i915/intel_overlay.c | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 2d2a2dedf132..c1e0bba60fc5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6ba3ddd9838f5e4d6ac7c6dce95648d205e11bff
+refs/heads/master: 0ddc1289f3ffd779779ddd3922f26ae7d0a21604
diff --git a/trunk/drivers/gpu/drm/i915/intel_overlay.c b/trunk/drivers/gpu/drm/i915/intel_overlay.c
index 4972b5ca1e8f..fef4dd61dcfd 100644
--- a/trunk/drivers/gpu/drm/i915/intel_overlay.c
+++ b/trunk/drivers/gpu/drm/i915/intel_overlay.c
@@ -1386,6 +1386,12 @@ void intel_setup_overlay(struct drm_device *dev)
                         goto out_free_bo;
                 }
 		overlay->flip_addr = overlay->reg_bo->gtt_offset;
+
+		ret = i915_gem_object_set_to_gtt_domain(reg_bo, true);
+		if (ret) {
+                        DRM_ERROR("failed to move overlay register bo into the GTT\n");
+                        goto out_unpin_bo;
+                }
 	} else {
 		ret = i915_gem_attach_phys_object(dev, reg_bo,
 						  I915_GEM_PHYS_OVERLAY_REGS,
@@ -1418,6 +1424,8 @@ void intel_setup_overlay(struct drm_device *dev)
 	DRM_INFO("initialized overlay support\n");
 	return;
 
+out_unpin_bo:
+	i915_gem_object_unpin(reg_bo);
 out_free_bo:
 	drm_gem_object_unreference(reg_bo);
 out_free: