summaryrefslogtreecommitdiff
path: root/src/sna/kgem.c
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2012-07-06 09:42:37 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2012-07-06 10:06:16 +0100
commit5784e0f21dc91f33c99a507105a0695cc53d6574 (patch)
tree3b4a4d1823166a57e8a88a537eb5ee097398bf16 /src/sna/kgem.c
parent1ee10cc3b2aa0888753eeb25c7fde7296a3c92eb (diff)
Allow matching against any device supported by drm/i915
However we cannot enable acceleration if we do not recognise its hardware layout or instruction set. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src/sna/kgem.c')
-rw-r--r--src/sna/kgem.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/sna/kgem.c b/src/sna/kgem.c
index abae21a6..2ace6ca5 100644
--- a/src/sna/kgem.c
+++ b/src/sna/kgem.c
@@ -543,7 +543,10 @@ static struct list *active(struct kgem *kgem, int num_pages, int tiling)
static size_t
agp_aperture_size(struct pci_device *dev, int gen)
{
- return dev->regions[gen < 30 ? 0 : 2].size;
+ /* XXX assume that only future chipsets are unknown and follow
+ * the post gen2 PCI layout.
+ */
+ return dev->regions[(gen && gen < 30) ? 0 : 2].size;
}
static size_t