summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri/i965/brw_reset.c
diff options
context:
space:
mode:
authorIan Romanick <[email protected]>2013-11-18 12:39:02 -0800
committerIan Romanick <[email protected]>2013-11-26 13:10:52 -0800
commit0ae84399069b77e9464462c53405baf6f854a6fd (patch)
tree727272f9284f8034ab196b8df011a21783b99948 /src/mesa/drivers/dri/i965/brw_reset.c
parentcb728bb028d782d5619e3da63afeeaf0b68507d0 (diff)
Revert "i965: Make the driver compile until a proper libdrm can be released."
libdrm 2.4.48 has been released. This reverts commit bd4596efac2b783b789392a222da909efcd0fd3b. Reviewed-by: Matt Turner <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/mesa/drivers/dri/i965/brw_reset.c')
-rw-r--r--src/mesa/drivers/dri/i965/brw_reset.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_reset.c b/src/mesa/drivers/dri/i965/brw_reset.c
index e93b2e253ad..7eca1bca0b2 100644
--- a/src/mesa/drivers/dri/i965/brw_reset.c
+++ b/src/mesa/drivers/dri/i965/brw_reset.c
@@ -42,17 +42,10 @@ 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.