Mesa (master): gallium/radeon: read_registers should return bool meaning success or failure

[Marek Olšák]

Module: Mesa
Branch: master
Commit: 6924ecac77d1d041420c571de9d31cff1d30aecc
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6924ecac77d1d041420c571de9d31cff1d30aecc

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Sat Aug 22 14:17:10 2015 +0200

gallium/radeon: read_registers should return bool meaning success or failure

Acked-by: Christian König <christian.koenig at amd.com>
Acked-by: Alex Deucher <alexander.deucher at amd.com>

---

 src/gallium/drivers/radeon/radeon_winsys.h        |    2 +-
 src/gallium/drivers/radeonsi/si_debug.c           |    4 ++--
 src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c     |    6 +++---
 src/gallium/winsys/radeon/drm/radeon_drm_winsys.c |    6 ++++--
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/gallium/drivers/radeon/radeon_winsys.h b/src/gallium/drivers/radeon/radeon_winsys.h
index 7ab6e56..a4a2ae1 100644
--- a/src/gallium/drivers/radeon/radeon_winsys.h
+++ b/src/gallium/drivers/radeon/radeon_winsys.h
@@ -680,7 +680,7 @@ struct radeon_winsys {
     uint64_t (*query_value)(struct radeon_winsys *ws,
                             enum radeon_value_id value);
 
-    void (*read_registers)(struct radeon_winsys *ws, unsigned reg_offset,
+    bool (*read_registers)(struct radeon_winsys *ws, unsigned reg_offset,
                            unsigned num_registers, uint32_t *out);
 };
 
diff --git a/src/gallium/drivers/radeonsi/si_debug.c b/src/gallium/drivers/radeonsi/si_debug.c
index 22d6f25..d3fd201 100644
--- a/src/gallium/drivers/radeonsi/si_debug.c
+++ b/src/gallium/drivers/radeonsi/si_debug.c
@@ -349,8 +349,8 @@ static void si_dump_mmapped_reg(struct si_context *sctx, FILE *f,
 	struct radeon_winsys *ws = sctx->b.ws;
 	uint32_t value;
 
-	ws->read_registers(ws, offset, 1, &value);
-	si_dump_reg(f, offset, value, ~0);
+	if (ws->read_registers(ws, offset, 1, &value))
+		si_dump_reg(f, offset, value, ~0);
 }
 
 static void si_dump_debug_registers(struct si_context *sctx, FILE *f)
diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c b/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c
index 012c900..875dcd0 100644
--- a/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c
+++ b/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c
@@ -350,14 +350,14 @@ static uint64_t amdgpu_query_value(struct radeon_winsys *rws,
    return 0;
 }
 
-static void amdgpu_read_registers(struct radeon_winsys *rws,
+static bool amdgpu_read_registers(struct radeon_winsys *rws,
                                   unsigned reg_offset,
                                   unsigned num_registers, uint32_t *out)
 {
    struct amdgpu_winsys *ws = (struct amdgpu_winsys*)rws;
 
-   amdgpu_read_mm_registers(ws->dev, reg_offset / 4, num_registers,
-                            0xffffffff, 0, out);
+   return amdgpu_read_mm_registers(ws->dev, reg_offset / 4, num_registers,
+                                   0xffffffff, 0, out) == 0;
 }
 
 static unsigned hash_dev(void *key)
diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c
index f7784fb..384d728 100644
--- a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c
+++ b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c
@@ -583,7 +583,7 @@ static uint64_t radeon_query_value(struct radeon_winsys *rws,
     return 0;
 }
 
-static void radeon_read_registers(struct radeon_winsys *rws,
+static bool radeon_read_registers(struct radeon_winsys *rws,
                                   unsigned reg_offset,
                                   unsigned num_registers, uint32_t *out)
 {
@@ -593,9 +593,11 @@ static void radeon_read_registers(struct radeon_winsys *rws,
     for (i = 0; i < num_registers; i++) {
         uint32_t reg = reg_offset + i*4;
 
-        radeon_get_drm_value(ws->fd, RADEON_INFO_READ_REG, "read-reg", &reg);
+        if (!radeon_get_drm_value(ws->fd, RADEON_INFO_READ_REG, NULL, &reg))
+            return false;
         out[i] = reg;
     }
+    return true;
 }
 
 static unsigned hash_fd(void *key)