From d58e3fa353c5df8028413837a366a16ff6054015 Mon Sep 17 00:00:00 2001 From: Hugues Hiegel Date: Fri, 17 Jun 2011 15:50:22 +0200 Subject: Revert "Verbose output for radeon/drm" This reverts commit df1458659d427f8664c59dc5a4622da15a18b640. --- src/gallium/state_trackers/egl/android/native_android.cpp | 7 ------- src/gralloc/gralloc_gem_radeon.c | 6 +----- src/gralloc/gralloc_mod.c | 6 +----- 3 files changed, 2 insertions(+), 17 deletions(-) diff --git a/src/gallium/state_trackers/egl/android/native_android.cpp b/src/gallium/state_trackers/egl/android/native_android.cpp index 6cf57744b3..a584d54db4 100644 --- a/src/gallium/state_trackers/egl/android/native_android.cpp +++ b/src/gallium/state_trackers/egl/android/native_android.cpp @@ -506,24 +506,17 @@ android_display_init_drm(struct native_display *ndpy) if (!err) { const gralloc_module_t *gr = (gralloc_module_t *) mod; - _eglLog(_EGL_WARNING, "drm PFO (line:%d)", __LINE__); err = -EINVAL; if (gr->perform) - { err = gr->perform(gr, GRALLOC_MODULE_PERFORM_GET_DRM_FD, &fd); - _eglLog(_EGL_WARNING, "drm PFO (line:%d)", __LINE__); - } } - _eglLog(_EGL_WARNING, "drm PFO (line:%d) fd = %d", __LINE__, fd); if (!err && fd >= 0) { drmVersionPtr version; const char *name; version = drmGetVersion(fd); - _eglLog(_EGL_WARNING, "drm PFO (line:%d)", __LINE__); if (version) { name = get_drm_screen_name(fd, version); - _eglLog(_EGL_WARNING, "drm PFO (line:%d) name : %s", __LINE__, name); if (name) { adpy->base.screen = adpy->event_handler->new_drm_screen(&adpy->base, name, fd); 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