From c0434ab49035bf278dad6f5f84a541ea58536fb4 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Thu, 30 Jun 2011 16:31:28 +0100 Subject: sna: Distinguish 830/845 vs 855/865 using the generation id Remove the PCI ID device checks by using the simpler check on the generation id for errata pertaining to 830/845. Signed-off-by: Chris Wilson --- src/sna/sna_video_overlay.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/sna/sna_video_overlay.c') diff --git a/src/sna/sna_video_overlay.c b/src/sna/sna_video_overlay.c index c4838c2d..422ce53d 100644 --- a/src/sna/sna_video_overlay.c +++ b/src/sna/sna_video_overlay.c @@ -540,7 +540,7 @@ sna_video_overlay_query_video_attributes(ScrnInfoPtr scrn, DBG(("%s: w is %d, h is %d\n", __FUNCTION__, *w, *h)); - if (IS_845G(sna) || IS_I830(sna)) { + if (sna->kgem.gen < 21) { if (*w > IMAGE_MAX_WIDTH_LEGACY) *w = IMAGE_MAX_WIDTH_LEGACY; if (*h > IMAGE_MAX_HEIGHT_LEGACY) @@ -651,7 +651,7 @@ XF86VideoAdaptorPtr sna_video_overlay_setup(struct sna *sna, adaptor->nEncodings = 1; adaptor->pEncodings = xnfalloc(sizeof(DummyEncoding)); memcpy(adaptor->pEncodings, DummyEncoding, sizeof(DummyEncoding)); - if (IS_845G(sna) || IS_I830(sna)) { + if (sna->kgem.gen < 21) { adaptor->pEncodings->width = IMAGE_MAX_WIDTH_LEGACY; adaptor->pEncodings->height = IMAGE_MAX_HEIGHT_LEGACY; } -- cgit v1.2.3