diff options
| author | Eric Anholt <[email protected]> | 2013-11-08 10:49:47 -0800 |
|---|---|---|
| committer | Kristian Høgsberg <[email protected]> | 2013-11-09 13:00:53 -0800 |
| commit | bd4596efac2b783b789392a222da909efcd0fd3b (patch) | |
| tree | 7968b1051f0187f69140da5a321667594b1ccad3 | |
| parent | f0f202e6b764be803470e27cba9102f14361ae22 (diff) | |
i965: Make the driver compile until a proper libdrm can be released.
No depending on unreleased code.
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_context.c | 8 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_reset.c | 7 |
2 files changed, 10 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c index a33e993f281..bee98e38996 100644 --- a/src/mesa/drivers/dri/i965/brw_context.c +++ b/src/mesa/drivers/dri/i965/brw_context.c @@ -714,12 +714,10 @@ brwCreateContext(gl_api api, } /* Notification of GPU resets requires hardware contexts and a kernel new - * enough to support DRM_IOCTL_I915_GET_RESET_STATS. + * enough to support DRM_IOCTL_I915_GET_RESET_STATS, which isn't upstream + * yet. */ - if (notify_reset && - (brw->hw_ctx == NULL - || drm_intel_get_reset_stats(brw->hw_ctx, &brw->reset_count, NULL, - NULL))) { + if (notify_reset) { /* This is the wrong error code, but the correct error code (one that * will cause EGL to generate EGL_BAD_MATCH) doesn't seem to exist. */ diff --git a/src/mesa/drivers/dri/i965/brw_reset.c b/src/mesa/drivers/dri/i965/brw_reset.c index 7eca1bca0b2..e93b2e253ad 100644 --- a/src/mesa/drivers/dri/i965/brw_reset.c +++ b/src/mesa/drivers/dri/i965/brw_reset.c @@ -42,10 +42,17 @@ brw_get_graphics_reset_status(struct gl_context *ctx) */ assert(brw->hw_ctx != NULL); +#if 0 + /* This is waiting until the kernel code can be merged and a new libdrm + * actually released. + */ err = drm_intel_get_reset_stats(brw->hw_ctx, &reset_count, &active, &pending); if (err) return GL_NO_ERROR; +#else + return GL_NO_ERROR; +#endif /* A reset was observed while a batch from this context was executing. * Assume that this context was at fault. |