diff options
| author | Eric Anholt <eric@anholt.net> | 2009-04-27 14:50:54 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2009-04-27 16:32:25 -0700 |
| commit | 3187c7698b93f1d0e07798e9c42ca2877d55e055 (patch) | |
| tree | 1cd7fae155983e96dad898ecf1c965baff271cc3 /src/i830_memory.c | |
| parent | fbaf13c93511547c563129527797fbef8628652e (diff) | |
| download | xorg-driver-xf86-video-intel-3187c7698b93f1d0e07798e9c42ca2877d55e055.tar.gz | |
Fix assert at startup with DRI initialiation failure.
In this path, we'd make it to allocator_init -> init_bufmgr without
GEM and without FbBase being initialized, leading to assertion failure
to catch this mistake.
Comedy ensued when trying to move just the MapMem up, leading to the rest
of the commit. Some day (like tomorrow after I rebase intel-cleanup) I'll
clean this path up.
Tested with 2 X Servers on 2.6.28 (one gets DRI2, one fails successfully),
2 UMS X Servers on 2.6.30rc2 (each gets DRI2), and 2 KMS X Servers on
2.6.30rc2 (success all around).
Diffstat (limited to 'src/i830_memory.c')
| -rw-r--r-- | src/i830_memory.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/i830_memory.c b/src/i830_memory.c index 54cee563..760e07cd 100644 --- a/src/i830_memory.c +++ b/src/i830_memory.c @@ -1065,6 +1065,7 @@ i830_allocate_ringbuffer(ScrnInfoPtr pScrn) } pI830->ring.tail_mask = pI830->ring.mem->size - 1; + pI830->ring.virtual_start = pI830->FbBase + pI830->ring.mem->offset; return TRUE; } |