diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2012-01-27 00:37:51 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2012-01-27 10:12:33 +0000 |
| commit | ce1cae7f4715fc8e14327c5b705d9f2cc45a3741 (patch) | |
| tree | 011054c4e1377f1e1072e8d4e0da09089ab3fafa | |
| parent | 541908524f9ee754db3bc45d2e1681d34479c1cc (diff) | |
sna/video: Simplify the gen2/915gm check
And make the later check in put image match.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
| -rw-r--r-- | src/sna/sna_video_hwmc.c | 5 | ||||
| -rw-r--r-- | src/sna/sna_video_textured.c | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/sna/sna_video_hwmc.c b/src/sna/sna_video_hwmc.c index 3da7d3a5..1f36096c 100644 --- a/src/sna/sna_video_hwmc.c +++ b/src/sna/sna_video_hwmc.c @@ -196,10 +196,7 @@ Bool sna_video_xvmc_setup(struct sna *sna, char buf[64]; /* Needs KMS support. */ - if (IS_I915G(sna) || IS_I915GM(sna)) - return FALSE; - - if (IS_GEN2(sna)) + if (sna->kgem.gen < 31) return FALSE; pAdapt = calloc(1, sizeof(XF86MCAdaptorRec)); diff --git a/src/sna/sna_video_textured.c b/src/sna/sna_video_textured.c index a72d3351..fcef8209 100644 --- a/src/sna/sna_video_textured.c +++ b/src/sna/sna_video_textured.c @@ -245,7 +245,7 @@ sna_video_textured_put_image(ScrnInfoPtr scrn, return Success; if (xvmc_passthrough(id)) { - if (sna->kgem.gen == 30) { + if (sna->kgem.gen < 31) { /* XXX: i915 is not support and needs some * serious care. grep for KMS in i915_hwmc.c */ return BadAlloc; |