summaryrefslogtreecommitdiff
path: root/src/i830_memory.c
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2010-05-10 19:38:24 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2010-05-10 19:38:24 +0100
commita8761585ef0b37736d302299d6b03e0957ad3e16 (patch)
tree0432ba968f298e8df39e93eb658f250bdd012c65 /src/i830_memory.c
parent9e9b0d85da801f1f95c7bc7e99566fe7056f5813 (diff)
i830: Minor cleanup
Remove some extraneous prototypes and unused variables. Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src/i830_memory.c')
-rw-r--r--src/i830_memory.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/i830_memory.c b/src/i830_memory.c
index a21f29b5..6a73bf6c 100644
--- a/src/i830_memory.c
+++ b/src/i830_memory.c
@@ -219,19 +219,18 @@ static Bool IsTileable(ScrnInfoPtr scrn, int pitch)
drm_intel_bo *i830_allocate_framebuffer(ScrnInfoPtr scrn)
{
intel_screen_private *intel = intel_get_screen_private(scrn);
- unsigned int pitch = scrn->displayWidth * intel->cpp;
+ drm_intel_bo *front_buffer;
long size, fb_height;
- int flags, ret;
- drm_intel_bo *front_buffer = NULL;
+ unsigned int pitch;
uint32_t tiling_mode, requested_tiling_mode;
-
- flags = ALLOW_SHARING | DISABLE_REUSE;
+ int ret;
/* We'll allocate the fb such that the root window will fit regardless of
* rotation.
*/
fb_height = scrn->virtualY;
+ pitch = scrn->displayWidth * intel->cpp;
size = ROUND_TO_PAGE(pitch * fb_height);
if (intel->tiling && IsTileable(scrn, pitch))
@@ -254,7 +253,6 @@ drm_intel_bo *i830_allocate_framebuffer(ScrnInfoPtr scrn)
front_buffer = drm_intel_bo_alloc(intel->bufmgr, "front buffer",
size, GTT_PAGE_SIZE);
-
if (front_buffer == NULL) {
xf86DrvMsg(scrn->scrnIndex, X_ERROR,
"Failed to allocate framebuffer.\n");