summaryrefslogtreecommitdiff
path: root/src/sna/sna_video_hwmc.c
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2012-07-23 21:55:46 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2012-07-23 21:55:46 +0100
commit40d90dfd8674c255a45b46bbdc09d497af5b3f50 (patch)
tree0895bc6f9f180282048a74036f6600fc31f6c713 /src/sna/sna_video_hwmc.c
parente3f6c48d18c316899c71b6fc34971039c6f9e5f8 (diff)
intel: Refactor the common chipset detection/override
Reduce the duplicate messages for which type of chip we by amalgamating the common code. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src/sna/sna_video_hwmc.c')
-rw-r--r--src/sna/sna_video_hwmc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/sna/sna_video_hwmc.c b/src/sna/sna_video_hwmc.c
index 2baa9398..b0e8d25d 100644
--- a/src/sna/sna_video_hwmc.c
+++ b/src/sna/sna_video_hwmc.c
@@ -78,7 +78,7 @@ static int create_context(ScrnInfoPtr scrn, XvMCContextPtr pContext,
contextRec->type = XVMC_I965_MPEG2_MC;
contextRec->i965.is_g4x = sna->kgem.gen == 45;
contextRec->i965.is_965_q = IS_965_Q(sna);
- contextRec->i965.is_igdng = IS_GEN5(sna);
+ contextRec->i965.is_igdng = sna->kgem.gen == 50;
} else {
contextRec->type = XVMC_I915_MPEG2_MC;
contextRec->i915.use_phys_addr = 0;
@@ -192,7 +192,7 @@ Bool sna_video_xvmc_setup(struct sna *sna,
XF86VideoAdaptorPtr target)
{
XF86MCAdaptorRec *pAdapt;
- char *name;
+ const char *name;
char buf[64];
/* Needs KMS support. */