diff options
| author | Keith Packard <keithp@neko.keithp.com> | 2006-11-26 18:26:26 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@neko.keithp.com> | 2006-11-26 18:26:26 -0800 |
| commit | a47c549df036990e29f05bc3df80e1a2ab9f3b3c (patch) | |
| tree | 6b670f35956eb2c186685202625f490f48c059a1 /src/i830_crt.c | |
| parent | 2529863a1ade782819d76be2d0dc16e89028c1e3 (diff) | |
Clean up reworked data structure code so the server actually starts.
Use i830GeLoadDetectPipe again (instead of missing xf86AllocCrtc). Actually
create new Crtc structures. Fix a few other NULL pointer dereferences.
Diffstat (limited to 'src/i830_crt.c')
| -rw-r--r-- | src/i830_crt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/i830_crt.c b/src/i830_crt.c index 615e96a3..3d755876 100644 --- a/src/i830_crt.c +++ b/src/i830_crt.c @@ -292,13 +292,13 @@ i830_crt_detect(I830_xf86OutputPtr output) return OUTPUT_STATUS_CONNECTED; /* Use the load-detect method if we have no other way of telling. */ - crtc = i830xf86AllocCrtc (output); + crtc = i830GetLoadDetectPipe (output); if (crtc) { Bool connected = i830_crt_detect_load(crtc, output); - i830xf86FreeCrtc (crtc); + i830ReleaseLoadDetectPipe (output); if (connected) return OUTPUT_STATUS_CONNECTED; else |