Mesa (master): i915: Remove always-true irq_active struct intel_screen field

Kristian Høgsberg krh at kemper.freedesktop.org
Thu Feb 11 21:59:31 UTC 2010


Module: Mesa
Branch: master
Commit: cc57baff5f40ba0ab3d3044c4fcd867e5b0e640e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=cc57baff5f40ba0ab3d3044c4fcd867e5b0e640e

Author: Kristian Høgsberg <krh at bitplanet.net>
Date:   Thu Feb 11 16:50:46 2010 -0500

i915: Remove always-true irq_active struct intel_screen field

---

 src/mesa/drivers/dri/intel/intel_context.c |    5 -----
 src/mesa/drivers/dri/intel/intel_screen.c  |    1 -
 src/mesa/drivers/dri/intel/intel_screen.h  |    2 --
 3 files changed, 0 insertions(+), 8 deletions(-)

diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c
index 7e5f4f1..e9315a5 100644
--- a/src/mesa/drivers/dri/intel/intel_context.c
+++ b/src/mesa/drivers/dri/intel/intel_context.c
@@ -718,11 +718,6 @@ intelInitContext(struct intel_context *intel,
 
    intel->RenderIndex = ~0;
 
-   if (intel->gen >= 4 && !intel->intelScreen->irq_active) {
-      _mesa_printf("IRQs not active.  Exiting\n");
-      exit(1);
-   }
-
    intelInitExtensions(ctx);
 
    INTEL_DEBUG = driParseDebugString(getenv("INTEL_DEBUG"), debug_control);
diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c
index 221e40c..6dc20d0 100644
--- a/src/mesa/drivers/dri/intel/intel_screen.c
+++ b/src/mesa/drivers/dri/intel/intel_screen.c
@@ -368,7 +368,6 @@ __DRIconfig **intelInitScreen2(__DRIscreen *psp)
    if (!intel_init_bufmgr(intelScreen))
        return GL_FALSE;
 
-   intelScreen->irq_active = 1;
    psp->extensions = intelScreenExtensions;
 
    msaa_samples_array[0] = 0;
diff --git a/src/mesa/drivers/dri/intel/intel_screen.h b/src/mesa/drivers/dri/intel/intel_screen.h
index 4c9579a..c31b836 100644
--- a/src/mesa/drivers/dri/intel/intel_screen.h
+++ b/src/mesa/drivers/dri/intel/intel_screen.h
@@ -42,8 +42,6 @@ struct intel_screen
 
    __DRIscreen *driScrnPriv;
 
-   int irq_active;
-
    GLboolean no_hw;
 
    GLboolean no_vbo;




More information about the mesa-commit mailing list