fdo-mirrors/plymouth
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/plymouth/plymouth.git synced 2026-05-07 14:18:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

[drm] Add more debug spew

Browse source
This commit is contained in:
Ray Strode 2010-03-24 10:08:09 -04:00
parent d4821f7c0b
commit 186381ee63
3 changed files with 55 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/plugins/renderers/drm/ply-renderer-i915-driver.c
View file

@ -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;
}

20
src/plugins/renderers/drm/ply-renderer-nouveau-driver.c
View file

@ -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;
}

25
src/plugins/renderers/drm/ply-renderer-radeon-driver.c
View file

@ -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;
}