From: Tom Stellard <thomas.stellard@amd.com>
Date: Fri, 13 Jun 2014 16:58:13 +0000 (-0400)
Subject: radeon/compute: Always report at least 1 compute unit
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ac26a562edc8b249de083a766eeac9ce1678cfa2;p=mesa.git

radeon/compute: Always report at least 1 compute unit

Some apps will abort if they detect 0 compute units.  This fixes
crashes in some OpenCV tests.
---

diff --git a/src/gallium/drivers/radeon/r600_pipe_common.c b/src/gallium/drivers/radeon/r600_pipe_common.c
index 4b9d31c4da3..1911cdef3de 100644
--- a/src/gallium/drivers/radeon/r600_pipe_common.c
+++ b/src/gallium/drivers/radeon/r600_pipe_common.c
@@ -523,7 +523,7 @@ static int r600_get_compute_param(struct pipe_screen *screen,
 	case PIPE_COMPUTE_CAP_MAX_COMPUTE_UNITS:
 		if (ret) {
 			uint32_t *max_compute_units = ret;
-			*max_compute_units = rscreen->info.max_compute_units;
+			*max_compute_units = MAX2(rscreen->info.max_compute_units, 1);
 		}
 		return sizeof(uint32_t);