Mesa (mesa_7_7_branch): r600: enable OQ on rv740 on drms with working pipe config
Alex Deucher
agd5f at kemper.freedesktop.org
Fri Feb 26 20:40:16 UTC 2010
Module: Mesa
Branch: mesa_7_7_branch
Commit: 7123f3d77ad7a62d9604d3febc42881e881452ea
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7123f3d77ad7a62d9604d3febc42881e881452ea
Author: Alex Deucher <alexdeucher at gmail.com>
Date: Fri Feb 26 15:24:12 2010 -0500
r600: enable OQ on rv740 on drms with working pipe config
---
src/mesa/drivers/dri/r600/r600_context.c | 9 ++++++---
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 5cfa490..82d70cc 100644
--- a/src/mesa/drivers/dri/r600/r600_context.c
+++ b/src/mesa/drivers/dri/r600/r600_context.c
@@ -320,9 +320,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.
More information about the mesa-commit
mailing list