summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Deucher <alexdeucher@gmail.com>2010-02-26 15:24:12 -0500
committerAlex Deucher <alexdeucher@gmail.com>2010-02-26 15:26:51 -0500
commit52eb2ef6bf4e3327ed008c691efb821ecaa422b2 (patch)
tree6ce3dfcfa6923a3c1e8df96934511213f11ae0a9
parent424a8385e4d07860c6deca12c43d6c31698a29ed (diff)
r600: enable OQ on rv740 on drms with working pipe config
-rw-r--r--src/mesa/drivers/dri/r600/r600_context.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/r600/r600_context.c b/src/mesa/drivers/dri/r600/r600_context.c
index f575e74c3e..1a4b014d9f 100644
--- a/src/mesa/drivers/dri/r600/r600_context.c
+++ b/src/mesa/drivers/dri/r600/r600_context.c
@@ -340,9 +340,12 @@ static void r600InitGLExtensions(GLcontext *ctx)
_mesa_enable_extension(ctx, "GL_EXT_texture_compression_s3tc");
}
- /* XXX: RV740 only seems to report results from half of its DBs */
- if (r600->radeon.radeonScreen->chip_family == CHIP_FAMILY_RV740)
- _mesa_disable_extension(ctx, "GL_ARB_occlusion_query");
+ /* RV740 had a broken pipe config prior to drm 1.32 */
+ if (!r600->radeon.radeonScreen->kernel_mm) {
+ if ((r600->radeon.dri.drmMinor < 32) &&
+ (r600->radeon.radeonScreen->chip_family == CHIP_FAMILY_RV740))
+ _mesa_disable_extension(ctx, "GL_ARB_occlusion_query");
+ }
}
/* Create the device specific rendering context.