From 44735f3b7947f522bf00c78ed383d59f756c762d Mon Sep 17 00:00:00 2001 From: Daniel Vetter Date: Sat, 6 Apr 2013 23:54:56 +0200 Subject: [PATCH] --- yaml --- r: 371448 b: refs/heads/master c: 8bb6e9590b6a568c643d0e8e73e0689ceb489e01 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/intel_display.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 8a14b0732655..aab155bb33d3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9a7c7890d2f05af63f98ac397597755a3c009485 +refs/heads/master: 8bb6e9590b6a568c643d0e8e73e0689ceb489e01 diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/drivers/gpu/drm/i915/intel_display.c index b884932c2e00..04d91cc21381 100644 --- a/trunk/drivers/gpu/drm/i915/intel_display.c +++ b/trunk/drivers/gpu/drm/i915/intel_display.c @@ -2002,8 +2002,10 @@ intel_pin_and_fence_fb_obj(struct drm_device *dev, alignment = 0; break; case I915_TILING_Y: - /* FIXME: Is this true? */ - DRM_ERROR("Y tiled not allowed for scan out buffers\n"); + /* Despite that we check this in framebuffer_init userspace can + * screw us over and change the tiling after the fact. Only + * pinned buffers can't change their tiling. */ + DRM_DEBUG_DRIVER("Y tiled not allowed for scan out buffers\n"); return -EINVAL; default: BUG();