diff options
| author | Eric Anholt <eric@anholt.net> | 2010-03-04 10:27:51 -0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2010-03-04 11:25:14 -0800 |
| commit | e8e615289213ba1704e402b923c51ce9d196f06f (patch) | |
| tree | 2c6f721d0023d2fb7a32e0952b4579d8eb06b816 /src/i830_driver.c | |
| parent | e37b562083aa3293e0c009171724a3f122d8a32d (diff) | |
Remove i830_allocate_2d_memory() now that it only called one function.
Diffstat (limited to 'src/i830_driver.c')
| -rw-r--r-- | src/i830_driver.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/i830_driver.c b/src/i830_driver.c index 6381549f..046adce2 100644 --- a/src/i830_driver.c +++ b/src/i830_driver.c @@ -987,17 +987,17 @@ static Bool i830_try_memory_allocation(ScrnInfoPtr scrn) "Attempting memory allocation with %stiled buffers.\n", tiled ? "" : "un"); - if (!i830_allocate_2d_memory(scrn)) - goto failed; + intel->front_buffer = i830_allocate_framebuffer(scrn); + if (!intel->front_buffer) { + xf86DrvMsg(scrn->scrnIndex, X_INFO, + "%siled allocation failed.\n", + tiled ? "T" : "Unt"); + return FALSE; + } xf86DrvMsg(scrn->scrnIndex, X_INFO, "%siled allocation successful.\n", tiled ? "T" : "Unt"); return TRUE; - -failed: - xf86DrvMsg(scrn->scrnIndex, X_INFO, "%siled allocation failed.\n", - tiled ? "T" : "Unt"); - return FALSE; } /* |