From patchwork Wed Feb 10 12:37:55 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [1/1] UBUNTU: (pre-stable) drm/i915: Increase fb alignment to 64k From: Andy Whitcroft X-Patchwork-Id: 45029 X-Patchwork-Delegate: stefan.bader@canonical.com Message-Id: <1265805475-29670-2-git-send-email-apw@canonical.com> To: kernel-team@lists.ubuntu.com Date: Wed, 10 Feb 2010 12:37:55 +0000 From: Chris Wilson BugLink: http://bugs.launchpad.net/bugs/404064 An untiled framebuffer must be aligned to 64k. This is normally handled by intel_pin_and_fence_fb_obj(), but the intelfb_create() likes to be Acked-by: Stefan Bader Acked-by: Tim Gardner different and do the pinning itself. However, it aligns the buffer object incorrectly for pre-i965 chipsets causing a PGTBL_ERR when it is installed onto the output. Fixes: KMS error message while initializing modesetting - render error detected: EIR: 0x10 [i915] http://bugs.freedesktop.org/show_bug.cgi?id=22936 Signed-off-by: Chris Wilson Cc: stable@kernel.org Signed-off-by: Andy Whitcroft --- drivers/gpu/drm/i915/intel_fb.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_fb.c b/drivers/gpu/drm/i915/intel_fb.c index 2b0fe54..1318ac2 100644 --- a/drivers/gpu/drm/i915/intel_fb.c +++ b/drivers/gpu/drm/i915/intel_fb.c @@ -148,7 +148,7 @@ static int intelfb_create(struct drm_device *dev, uint32_t fb_width, mutex_lock(&dev->struct_mutex); - ret = i915_gem_object_pin(fbo, PAGE_SIZE); + ret = i915_gem_object_pin(fbo, 64*1024); if (ret) { DRM_ERROR("failed to pin fb: %d\n", ret); goto out_unref;