From: Ray Strode <rstrode@redhat.com>
Date: Wed, 24 Mar 2010 14:08:09 +0000 (-0400)
Subject: [drm] Add more debug spew
X-Git-Tag: 0.8.0~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=186381ee63519340805db32b09a68474bacd4fa2;p=thirdparty%2Fplymouth.git

[drm] Add more debug spew
---

diff --git a/src/plugins/renderers/drm/ply-renderer-i915-driver.c b/src/plugins/renderers/drm/ply-renderer-i915-driver.c
index ed0ed2ce..c2eeacb4 100644
--- a/src/plugins/renderers/drm/ply-renderer-i915-driver.c
+++ b/src/plugins/renderers/drm/ply-renderer-i915-driver.c
@@ -101,6 +101,7 @@ destroy_driver (ply_renderer_driver_t *driver)
 {
   ply_hashtable_free (driver->buffers);
 
+  ply_trace ("uninitializing intel buffer manager");
   drm_intel_bufmgr_destroy (driver->manager);
   free (driver);
 }
@@ -122,6 +123,9 @@ ply_renderer_buffer_new (ply_renderer_driver_t *driver,
   buffer->height = height;
   buffer->row_stride = row_stride;
 
+  ply_trace ("returning %lux%lu buffer with stride %lu",
+             width, height, row_stride);
+
   return buffer;
 }
 
@@ -145,7 +149,10 @@ create_intel_bo_from_handle (ply_renderer_driver_t *driver,
   flink_request.handle = handle;
 
   if (ioctl (driver->device_fd, DRM_IOCTL_GEM_FLINK, &flink_request) < 0)
-    return NULL;
+    {
+      ply_trace ("Could not export global name for handle %u", handle);
+      return NULL;
+    }
 
   asprintf (&name, "buffer %u", handle);
 
@@ -214,10 +221,14 @@ fetch_buffer (ply_renderer_driver_t *driver,
 
   if (buffer == NULL)
     {
+      ply_trace ("could not fetch buffer %u, creating one", buffer_id);
       buffer = ply_renderer_buffer_new_from_id (driver, buffer_id);
 
       if (buffer == NULL)
-        return false;
+        {
+          ply_trace ("could not create buffer either %u", buffer_id);
+          return false;
+        }
 
       ply_hashtable_insert (driver->buffers,
                             (void *) (uintptr_t) buffer_id,
@@ -233,6 +244,8 @@ fetch_buffer (ply_renderer_driver_t *driver,
   if (row_stride != NULL)
     *row_stride = buffer->row_stride;
 
+  ply_trace ("fetched %lux%lu buffer with stride %lu",
+             buffer->width, buffer->height, buffer->row_stride);
   return true;
 }
 
diff --git a/src/plugins/renderers/drm/ply-renderer-nouveau-driver.c b/src/plugins/renderers/drm/ply-renderer-nouveau-driver.c
index a94b0f4b..33b04b86 100644
--- a/src/plugins/renderers/drm/ply-renderer-nouveau-driver.c
+++ b/src/plugins/renderers/drm/ply-renderer-nouveau-driver.c
@@ -81,6 +81,7 @@ create_driver (int device_fd)
   if (nouveau_device_open_existing (&driver->device, true,
                                     driver->device_fd, 0) < 0)
     {
+      ply_trace ("could not open nouveau device");
       free (driver);
       return NULL;
     }
@@ -96,6 +97,7 @@ destroy_driver (ply_renderer_driver_t *driver)
 {
   ply_hashtable_free (driver->buffers);
 
+  ply_trace ("closing nouveau device");
   nouveau_device_close (&driver->device);
   free (driver);
 }
@@ -117,6 +119,9 @@ ply_renderer_buffer_new (ply_renderer_driver_t *driver,
   buffer->height = height;
   buffer->row_stride = row_stride;
 
+  ply_trace ("returning %lux%lu buffer with stride %lu",
+             width, height, row_stride);
+
   return buffer;
 }
 
@@ -131,11 +136,16 @@ ply_renderer_buffer_new_from_id (ply_renderer_driver_t *driver,
   fb = drmModeGetFB (driver->device_fd, buffer_id);
 
   if (fb == NULL)
-    return NULL;
+    {
+      ply_trace ("could not get FB with buffer id %u", buffer_id);
+      return NULL;
+    }
 
   if (nouveau_bo_wrap (driver->device,
                        fb->handle, &buffer_object) < 0)
     {
+      ply_trace ("could not create buffer object from handle %lu",
+                 (unsigned long) fb->handle);
       drmModeFreeFB (fb);
       return NULL;
     }
@@ -171,10 +181,14 @@ fetch_buffer (ply_renderer_driver_t *driver,
 
   if (buffer == NULL)
     {
+      ply_trace ("could not fetch buffer %u, creating one", buffer_id);
       buffer = ply_renderer_buffer_new_from_id (driver, buffer_id);
 
       if (buffer == NULL)
-        return false;
+        {
+          ply_trace ("could not create buffer either %u", buffer_id);
+          return false;
+        }
 
       ply_hashtable_insert (driver->buffers,
                             (void *) (uintptr_t) buffer_id,
@@ -190,6 +204,8 @@ fetch_buffer (ply_renderer_driver_t *driver,
   if (row_stride != NULL)
     *row_stride = buffer->row_stride;
 
+  ply_trace ("fetched %lux%lu buffer with stride %lu",
+             buffer->width, buffer->height, buffer->row_stride);
   return true;
 }
 
diff --git a/src/plugins/renderers/drm/ply-renderer-radeon-driver.c b/src/plugins/renderers/drm/ply-renderer-radeon-driver.c
index be11dbf8..0f44ade6 100644
--- a/src/plugins/renderers/drm/ply-renderer-radeon-driver.c
+++ b/src/plugins/renderers/drm/ply-renderer-radeon-driver.c
@@ -81,6 +81,7 @@ create_driver (int device_fd)
   driver->manager = radeon_bo_manager_gem_ctor (driver->device_fd);
   if (driver->manager == NULL)
     {
+      ply_trace ("radeon buffer manager could not be initialized");
       free (driver);
       return NULL;
     }
@@ -96,6 +97,7 @@ destroy_driver (ply_renderer_driver_t *driver)
 {
   ply_hashtable_free (driver->buffers);
 
+  ply_trace ("uninitializing intel buffer manager");
   radeon_bo_manager_gem_dtor (driver->manager);
   free (driver);
 }
@@ -117,6 +119,9 @@ ply_renderer_buffer_new (ply_renderer_driver_t *driver,
   buffer->height = height;
   buffer->row_stride = row_stride;
 
+  ply_trace ("returning %lux%lu buffer with stride %lu",
+             width, height, row_stride);
+
   return buffer;
 }
 
@@ -150,7 +155,10 @@ create_radeon_bo_from_handle (ply_renderer_driver_t *driver,
   flink_request.handle = handle;
 
   if (ioctl (driver->device_fd, DRM_IOCTL_GEM_FLINK, &flink_request) < 0)
-    return NULL;
+    {
+      ply_trace ("Could not export global name for handle %u", handle);
+      return NULL;
+    }
 
   buffer_object = radeon_bo_open (driver->manager, flink_request.name,
                                   0, 0, RADEON_GEM_DOMAIN_GTT, 0);
@@ -169,12 +177,17 @@ ply_renderer_buffer_new_from_id (ply_renderer_driver_t *driver,
   fb = drmModeGetFB (driver->device_fd, buffer_id);
 
   if (fb == NULL)
-    return NULL;
+    {
+      ply_trace ("could not get FB with buffer id %u", buffer_id);
+      return NULL;
+    }
 
   buffer_object = create_radeon_bo_from_handle (driver, fb->handle);
 
   if (buffer_object == NULL)
     {
+      ply_trace ("could not create buffer object from handle %lu",
+                 (unsigned long) fb->handle);
       drmModeFreeFB (fb);
       return NULL;
     }
@@ -200,10 +213,14 @@ fetch_buffer (ply_renderer_driver_t *driver,
 
   if (buffer == NULL)
     {
+      ply_trace ("could not fetch buffer %u, creating one", buffer_id);
       buffer = ply_renderer_buffer_new_from_id (driver, buffer_id);
 
       if (buffer == NULL)
-        return false;
+        {
+          ply_trace ("could not create buffer either %u", buffer_id);
+          return false;
+        }
 
       ply_hashtable_insert (driver->buffers,
                             (void *) (uintptr_t) buffer_id,
@@ -219,6 +236,8 @@ fetch_buffer (ply_renderer_driver_t *driver,
   if (row_stride != NULL)
     *row_stride = buffer->row_stride;
 
+  ply_trace ("fetched %lux%lu buffer with stride %lu",
+             buffer->width, buffer->height, buffer->row_stride);
   return true;
 }