summaryrefslogtreecommitdiff
path: root/driver/xf86-video-intel/src/i810_dga.c
diff options
context:
space:
mode:
authorOwain Ainsworth <oga@cvs.openbsd.org>2010-07-18 14:47:49 +0000
committerOwain Ainsworth <oga@cvs.openbsd.org>2010-07-18 14:47:49 +0000
commit01dea479f07aa226272d1ca44995383755187447 (patch)
tree49ef4141f987553823c1982cf6abcbe33dcc0aea /driver/xf86-video-intel/src/i810_dga.c
parent301f11bce5a3c84f04cec6df50b03ff1fadc559d (diff)
Update the intel driver to (mostly) a backport of 2.12.
It is missing a few commits that I have yet to verify (ones that try and continue if we lock the gpu rendering engine and can't reset it, for example) taht will be verified and sent out for extra testing soon. Should contain a bunch of speedups and some correctness improvements (though rendercheck still gives some errors that I am looking into). This has been in snaps since the first day of c2k10, any known issues with just this driver have (to my knowledge) been fixed since. A problem with macbooks pointed out by otto happens with both this and the in-tree driver and thus doesn't stop this moving forward. As well as the 2.12 improvements, this driver also has a backport (partially aided by the backports in RHEL 5 kindly provided by Dave Airlie) from the kms code of modesetting support for ironlake (arrandale and clarkdale: the IGDs build into intel nehalem cpu dies) which has been tested on a number of chipsets. Note that Display port and eDP displays have not yet been worked on (and probably won't until I can find a displayport monitor), but VGA and lvds at least are known to work, sure beats vesa. "no objection on my side" matthieu@, prodding (as always) from princess marco.
Diffstat (limited to 'driver/xf86-video-intel/src/i810_dga.c')
-rw-r--r--driver/xf86-video-intel/src/i810_dga.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/driver/xf86-video-intel/src/i810_dga.c b/driver/xf86-video-intel/src/i810_dga.c
index 3f5305793..52a01b76f 100644
--- a/driver/xf86-video-intel/src/i810_dga.c
+++ b/driver/xf86-video-intel/src/i810_dga.c
@@ -84,10 +84,10 @@ I810DGAInit(ScreenPtr pScreen)
while (pMode) {
- newmodes = xrealloc(modes, (num + 1) * sizeof(DGAModeRec));
+ newmodes = realloc(modes, (num + 1) * sizeof(DGAModeRec));
if (!newmodes) {
- xfree(modes);
+ free(modes);
return FALSE;
}
modes = newmodes;