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;