diff options
| author | Eric Anholt <eric@anholt.net> | 2007-03-15 18:53:55 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2007-03-15 18:53:55 -0700 |
| commit | 316ee682d342556b65cbd60409201591e916aac5 (patch) | |
| tree | 48c70e7b25a7236e5df4b4d2a0ee480f6962b0ec /src/i830_display.c | |
| parent | 8b06ab50bbd79dfaf4c90a6f76116ace64b85b77 (diff) | |
Don't reload the cursors if we haven't set up the screen yet.
This avoids a crash during preinit if we set a mode for load detecting.
Diffstat (limited to 'src/i830_display.c')
| -rw-r--r-- | src/i830_display.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/i830_display.c b/src/i830_display.c index 2fc81b98..98137a22 100644 --- a/src/i830_display.c +++ b/src/i830_display.c @@ -578,7 +578,8 @@ static void i830_crtc_commit (xf86CrtcPtr crtc) { crtc->funcs->dpms (crtc, DPMSModeOn); - xf86_reload_cursors (crtc->scrn->pScreen); + if (crtc->scrn->pScreen != NULL) + xf86_reload_cursors (crtc->scrn->pScreen); } void |