From patchwork Mon Sep 23 20:33:22 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodrigo Vivi X-Patchwork-Id: 2929881 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 8D6F8BFF05 for ; Mon, 23 Sep 2013 20:37:12 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 58481203AD for ; Mon, 23 Sep 2013 20:37:11 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 9686520274 for ; Mon, 23 Sep 2013 20:37:10 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 63A50E71F8 for ; Mon, 23 Sep 2013 13:37:10 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-yh0-f44.google.com (mail-yh0-f44.google.com [209.85.213.44]) by gabe.freedesktop.org (Postfix) with ESMTP id 0B158E70D5 for ; Mon, 23 Sep 2013 13:33:48 -0700 (PDT) Received: by mail-yh0-f44.google.com with SMTP id f64so1585120yha.31 for ; Mon, 23 Sep 2013 13:33:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=SKgYvABLBDTrH4otW+iqaAWln8aE7nA8ZmSR4Y41yEE=; b=kffcXaXnCe6MPnvCGq2w1sGNZN1gviEnhTfdxDcZ4ia74xv9nBnOJwkebgA0pRtxvX Bab1FP5qpYK0N9j/eZ/H/KIuvPWk3fxufopC+FMF+wMtvfSM8spivki+d/3/497ug6S4 oBN6IOQaHIsGLmiQfpD8D2c2BKI70Ne63xAF9DB9Gqz59zS7qX4K9vqMZt/3g6Ljue/o BUnmlgy3bWYhMYbHhu3KkOYvrc1YFNrURJrlDhQjXWGRhBJgk1hXWrX/iJ8yhNP3A3+x IKKABYF2ijjBEYobmifVsNdRcRwiIkfbRfQcV9E9Rp4p+yh0rZvsr/J7V+mJyw22e5ro qRpg== X-Received: by 10.236.92.35 with SMTP id i23mr5029yhf.104.1379968428447; Mon, 23 Sep 2013 13:33:48 -0700 (PDT) Received: from localhost.localdomain ([186.204.164.107]) by mx.google.com with ESMTPSA id v96sm38875107yhp.3.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 23 Sep 2013 13:33:48 -0700 (PDT) From: Rodrigo Vivi To: intel-gfx@lists.freedesktop.org Date: Mon, 23 Sep 2013 17:33:22 -0300 Message-Id: <1379968410-14428-6-git-send-email-rodrigo.vivi@gmail.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1379968410-14428-1-git-send-email-rodrigo.vivi@gmail.com> References: <1379968410-14428-1-git-send-email-rodrigo.vivi@gmail.com> Subject: [Intel-gfx] [PATCH 05/13] drm/i915: Align tiled scanouts from stolen memory to 256k in the GTT X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Chris Wilson For unfathomable reasons this alignment appears to be required for tiled scanouts being read from stolen memory. I can find no reference in the w/a db to support this requirement, but the evidence of my own eyes says this prevents many headaches. Note that I have not tricked anything older than Sandybridge into using stolen tiled scanouts, so the extra alignment may be required there as well. Signed-off-by: Chris Wilson Signed-off-by: Rodrigo Vivi --- drivers/gpu/drm/i915/intel_display.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index bcf0960..105ec54 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -1879,6 +1879,8 @@ intel_pin_and_fence_fb_obj(struct drm_device *dev, case I915_TILING_X: /* pin() will align the object as required by fence */ alignment = 0; + if (obj->stolen && INTEL_INFO(dev)->gen >= 6) + alignment = 256 * 1024; break; case I915_TILING_Y: /* Despite that we check this in framebuffer_init userspace can