Received: from virtuous by box514.bluehost.com with local-bsmtp (Exim 4.69)
(envelope-from <chris@chris-wilson.co.uk>)
id 1My9I5-000222-1X
for jbarnes@virtuousgeek.org; Wed, 14 Oct 2009 13:13:41 -0600
X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on box514.bluehost.com
X-Spam-Level:
X-Spam-Status: No, score=-6.6 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED
shortcircuit=no autolearn=ham version=3.2.5
Received: from mga05.intel.com ([192.55.52.89] helo=fmsmga101.fm.intel.com)
by box514.bluehost.com with esmtp (Exim 4.69)
(envelope-from <chris@chris-wilson.co.uk>)
id 1My9I4-0001zV-9H
for jbarnes@virtuousgeek.org; Wed, 14 Oct 2009 13:13:40 -0600
Received: from fmsmga001.fm.intel.com ([10.253.24.23])
by fmsmga101.fm.intel.com with ESMTP; 14 Oct 2009 12:07:40 -0700
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="4.44,560,1249282800";
d="scan'208";a="736384260"
Received: from unknown (HELO localhost.localdomain) ([10.255.17.79])
by fmsmga001.fm.intel.com with ESMTP; 14 Oct 2009 12:16:28 -0700
From: Chris Wilson <chris@chris-wilson.co.uk>
To: intel-gfx@lists.freedesktop.org
Cc: Chris Wilson <chris@chris-wilson.co.uk>, Jesse Barnes <jbarnes@virtuousgeek.org>
Subject: [PATCH] drm/i915: Install a fence register for fbc on g4x
Date: Wed, 14 Oct 2009 20:12:46 +0100
Message-Id: <1255547566-9426-1-git-send-email-chris@chris-wilson.co.uk>
X-Mailer: git-send-email 1.6.4.3
X-Identified-User: {10642:box514.bluehost.com:virtuous:virtuousgeek.org} {sentby:program running on server}
To enable framebuffer compression on a g4x, we not only need the buffer
to tiled (X only), we also need to hold a fence register for the buffer.
Currently we only install a fence register for pre-i965s when setting up
the scanout buffer. Rather than adding some convoluted logic to
g4x_enable_fbc() to acquire a fence register, and perhaps to
g4x_disable_fbc() to release it again, we can extend the acquisition
during setup to all chipsets.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
---
drivers/gpu/drm/i915/intel_display.c | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
@@ -1262,9 +1262,11 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
return ret;
}
- /* Pre-i965 needs to install a fence for tiled scan-out */
- if (!IS_I965G(dev) &&
- obj_priv->fence_reg == I915_FENCE_REG_NONE &&
+ /* Install a fence for tiled scan-out. Pre-i965 always needs a fence,
+ * whereas 965+ only requires a fence if using framebuffer compression.
+ * For simplicity, we always install a fence as the cost is not that onerous.
+ */
+ if (obj_priv->fence_reg == I915_FENCE_REG_NONE &&
obj_priv->tiling_mode != I915_TILING_NONE) {
ret = i915_gem_object_get_fence_reg(obj);
if (ret != 0) {
--
1.6.4.3