From 7c9f9ea9b20e39ff68a702ea2ae3092aa0240807 Mon Sep 17 00:00:00 2001
From: Tom Stellard <thomas.stellard@amd.com>
Date: Mon, 27 Jan 2014 14:01:11 -0800
Subject: [PATCH] XXX: Debugging patch

---
 src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c | 10 ++++++++--
 src/gallium/auxiliary/util/u_dl.c                   |  7 ++++++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c b/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c
index 683d6a6..d2b101e 100644
--- a/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c
+++ b/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c
@@ -191,17 +191,22 @@ pipe_loader_drm_probe_fd(struct pipe_loader_device **dev, int fd)
 {
    struct pipe_loader_drm_device *ddev = CALLOC_STRUCT(pipe_loader_drm_device);
 
+   fprintf(stderr, "Probing %u\n", fd);
    ddev->base.type = PIPE_LOADER_DEVICE_PCI;
    ddev->base.ops = &pipe_loader_drm_ops;
    ddev->fd = fd;
 
    pipe_loader_drm_x_auth(fd);
 
-   if (!find_drm_pci_id(ddev))
+   if (!find_drm_pci_id(ddev)) {
+      fprintf(stderr, "No pci id\n");
       goto fail;
+   }
 
-   if (!find_drm_driver_name(ddev))
+   if (!find_drm_driver_name(ddev)) {
+      fprintf(stderr, "No name\n");
       goto fail;
+   }
 
    *dev = &ddev->base;
    return TRUE;
@@ -258,6 +263,7 @@ pipe_loader_drm_create_screen(struct pipe_loader_device *dev,
    struct pipe_loader_drm_device *ddev = pipe_loader_drm_device(dev);
    const struct drm_driver_descriptor *dd;
 
+   fprintf(stderr, "Searching %s for pipe-loader\n", library_paths);
    if (!ddev->lib)
       ddev->lib = pipe_loader_find_module(dev, library_paths);
    if (!ddev->lib)
diff --git a/src/gallium/auxiliary/util/u_dl.c b/src/gallium/auxiliary/util/u_dl.c
index aca435d..6e830b1 100644
--- a/src/gallium/auxiliary/util/u_dl.c
+++ b/src/gallium/auxiliary/util/u_dl.c
@@ -40,12 +40,17 @@
 #include "u_dl.h"
 #include "u_pointer.h"
 
+#include <stdio.h>
 
 struct util_dl_library *
 util_dl_open(const char *filename)
 {
 #if defined(PIPE_OS_UNIX)
-   return (struct util_dl_library *)dlopen(filename, RTLD_LAZY | RTLD_GLOBAL);
+   struct util_dl_library* lib = (struct util_dl_library *)dlopen(filename, RTLD_LAZY | RTLD_GLOBAL);
+   if (!lib) {
+      fprintf(stderr, "Error: %s\n", dlerror());
+   }
+   return lib;
 #elif defined(PIPE_OS_WINDOWS)
    return (struct util_dl_library *)LoadLibraryA(filename);
 #else
-- 
1.8.1.4

