From 699dbe4b56b12a92d98d5bc0afbc5edbe3fd21e9 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Thu, 12 Aug 2010 10:47:56 +0100
Subject: [PATCH] --- yaml --- r: 217919 b: refs/heads/master c:
 a29301288f1840bdf9c5456da9cd7c944436edd5 h: refs/heads/master i:   217917:
 ecf827ed204b034279788919ad1fa79f02f56c90   217915:
 b68f8dd57abf6d2db83958bca5cb5cfb3d4e66cc   217911:
 a5fc4e00325e97d6a842b1abce8e99120e429b2d   217903:
 28093baac663b3db6fd8d0350aeea4ebe230d635   217887:
 c5e5b8ceda9f6e3039d8b57fb5125fa787f5c26e   217855:
 be1545db0f53f55d1f7ddae86f3b9f0fb13d8377 v: v3

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

diff --git a/[refs] b/[refs]
index c64b854792fe..1585299f0bc9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 60fc332cb5ab19e5a86d696b210df65814b2ad8a
+refs/heads/master: a29301288f1840bdf9c5456da9cd7c944436edd5
diff --git a/trunk/drivers/gpu/drm/i915/intel_overlay.c b/trunk/drivers/gpu/drm/i915/intel_overlay.c
index ab2a8cad8129..b0aea47cb445 100644
--- a/trunk/drivers/gpu/drm/i915/intel_overlay.c
+++ b/trunk/drivers/gpu/drm/i915/intel_overlay.c
@@ -1406,7 +1406,7 @@ void intel_setup_overlay(struct drm_device *dev)
 	if (OVERLAY_NEEDS_PHYSICAL(dev)) {
 		ret = i915_gem_attach_phys_object(dev, reg_bo,
 						  I915_GEM_PHYS_OVERLAY_REGS,
-						  0);
+						  PAGE_SIZE);
                 if (ret) {
                         DRM_ERROR("failed to attach phys overlay regs\n");
                         goto out_free_bo;