diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2011-06-30 16:31:28 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2011-06-30 16:31:28 +0100 |
| commit | c0434ab49035bf278dad6f5f84a541ea58536fb4 (patch) | |
| tree | 0cbf98f55544839d4ef86509d0ac2481d6163778 /src/sna/sna_video_overlay.c | |
| parent | 18d08e49d270b7a05f14a309759c9315e5ab9679 (diff) | |
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 <chris@chris-wilson.co.uk>
Diffstat (limited to 'src/sna/sna_video_overlay.c')
| -rw-r--r-- | src/sna/sna_video_overlay.c | 4 |
1 files changed, 2 insertions, 2 deletions
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; } |