From 8f0a87fd310fb6208fc365a68dff499d40cfa997 Mon Sep 17 00:00:00 2001
From: PFO <pfolinux@rdi-linux>
Date: Thu, 16 Jun 2011 15:06:29 +0200
Subject: Revert "Verbose output for radeon/drm" This reverts commit
 df1458659d427f8664c59dc5a4622da15a18b640.

---
 src/gralloc/gralloc_gem_radeon.c | 6 +-----
 src/gralloc/gralloc_mod.c        | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

(limited to 'src/gralloc')

diff --git a/src/gralloc/gralloc_gem_radeon.c b/src/gralloc/gralloc_gem_radeon.c
index 4bd384c027..addb3419a6 100644
--- a/src/gralloc/gralloc_gem_radeon.c
+++ b/src/gralloc/gralloc_gem_radeon.c
@@ -72,12 +72,10 @@ eg_init_tile_config(struct radeon_info *info)
    memset(&ginfo, 0, sizeof(ginfo));
    ginfo.request = RADEON_INFO_TILING_CONFIG;
    ginfo.value = (long) &val;
-	LOGE("PFO gralloc line : %d", __LINE__);
    ret = drmCommandWriteRead(info->drm->fd, DRM_RADEON_INFO, &ginfo, sizeof(ginfo));
    if (ret)
       return ret;
 
-	LOGE("PFO gralloc line : %d", __LINE__);
    info->tile_config = val;
 
    switch (info->tile_config & 0xf) {
@@ -97,7 +95,6 @@ eg_init_tile_config(struct radeon_info *info)
       return -EINVAL;
       break;
    }
-	LOGE("PFO gralloc line : %d", __LINE__);
 
    info->num_banks = (info->tile_config & 0xf0) >> 4;
 
@@ -113,8 +110,7 @@ eg_init_tile_config(struct radeon_info *info)
       break;
    }
 
- 	LOGE("PFO gralloc line : %d", __LINE__);
-  info->have_tiling_info = 1;
+   info->have_tiling_info = 1;
    info->allow_color_tiling = 0;
 
    return 0;
diff --git a/src/gralloc/gralloc_mod.c b/src/gralloc/gralloc_mod.c
index 7f708616c8..bc0786eb3e 100644
--- a/src/gralloc/gralloc_mod.c
+++ b/src/gralloc/gralloc_mod.c
@@ -138,22 +138,18 @@ drm_mod_alloc_gpu0(alloc_device_t *dev, int w, int h, int format, int usage,
    struct drm_bo_t *bo;
    int size, bpp, ret;
 
-	LOGE("PFO gralloc line : %d", __LINE__);
    ret = drm_gem_drv_init(drm);
    if (ret)
       return ret;
 
-	LOGE("PFO gralloc line : %d", __LINE__);
    bpp = drm_mod_get_bpp(format);
    if (!bpp)
       return -EINVAL;
 
-	LOGE("PFO gralloc line : %d", __LINE__);
    bo = drm_gem_drv_alloc(drm, w, h, format, usage, stride);
    if (!bo)
       return -EINVAL;
- 	LOGE("PFO gralloc line : %d", __LINE__);
-  if (bo->usage & GRALLOC_USAGE_HW_FB) {
+   if (bo->usage & GRALLOC_USAGE_HW_FB) {
       ret = drm_kms_add_fb(drm, bo);
       if (ret) {
          LOGE("failed to add fb");
-- 
cgit v1.2.3


From 5607823fe4ff35e11086efa6302d8fbacd315b06 Mon Sep 17 00:00:00 2001
From: PFO <pfolinux@rdi-linux>
Date: Fri, 17 Jun 2011 16:01:06 +0200
Subject: radeon/r300: code cleanup

---
 src/gralloc/gralloc_gem_radeon.c |  4 ++--
 src/mesa/vbo/vbo_exec_api.c      | 21 +--------------------
 2 files changed, 3 insertions(+), 22 deletions(-)

(limited to 'src/gralloc')

diff --git a/src/gralloc/gralloc_gem_radeon.c b/src/gralloc/gralloc_gem_radeon.c
index addb3419a6..469a1488a0 100644
--- a/src/gralloc/gralloc_gem_radeon.c
+++ b/src/gralloc/gralloc_gem_radeon.c
@@ -223,12 +223,12 @@ drm_gem_radeon_init(struct drm_module_t *drm)
 
    drm->gem = (void *) info;
 
-/*   ret = eg_init_tile_config(info);
+   ret = eg_init_tile_config(info);
    if (ret) {
       radeon_bo_manager_gem_dtor(info->bufmgr);
       free(info);
       return ret;
-   }*/
+   }
 
    drm_gem_radeon_init_features(drm);
 
diff --git a/src/mesa/vbo/vbo_exec_api.c b/src/mesa/vbo/vbo_exec_api.c
index 3c430b9a05..d9656b3caf 100644
--- a/src/mesa/vbo/vbo_exec_api.c
+++ b/src/mesa/vbo/vbo_exec_api.c
@@ -432,7 +432,7 @@ do {									\
  * Flush (draw) vertices.
  * \param  unmap - leave VBO unmapped after flushing?
  */
-/*static void
+static void
 vbo_exec_FlushVertices_internal(struct vbo_exec_context *exec, GLboolean unmap)
 {
    if (exec->vtx.vert_count || unmap) {
@@ -444,7 +444,6 @@ vbo_exec_FlushVertices_internal(struct vbo_exec_context *exec, GLboolean unmap)
       reset_attrfv( exec );
    }
 }
-*/
 #if FEATURE_beginend
 
 
@@ -548,24 +547,6 @@ static void GLAPIENTRY vbo_exec_EvalPoint2( GLint i, GLint j )
 #endif /* FEATURE_evaluators */
 
 
-/**
- * Flush (draw) vertices.
- * \param  unmap - leave VBO unmapped after flushing?
- */
-static void
-vbo_exec_FlushVertices_internal(struct vbo_exec_context *exec, GLboolean unmap)
-{
-   if (exec->vtx.vert_count || unmap) {
-      vbo_exec_vtx_flush( exec, unmap );
-   }
-
-   if (exec->vtx.vertex_size) {
-      vbo_exec_copy_to_current( exec );
-      reset_attrfv( exec );
-   }
-}
-
-
 /**
  * Called via glBegin.
  */
-- 
cgit v1.2.3