i965: SNB GT1 has only 32k urb and max 128 urb entries.

Signed-off-by: Zou Nan hai <nanhai.zou@intel.com>

diff --git a/src/mesa/drivers/dri/i965/gen6_urb.c b/src/mesa/drivers/dri/i965/gen6_urb.c
index 57be50a445110f1746b2f5be5967dfacb6f67147..c3819f9b360a0e34703e390b2165f193be457045 100644 (file)
--- a/src/mesa/drivers/dri/i965/gen6_urb.c
+++ b/src/mesa/drivers/dri/i965/gen6_urb.c
@@ -34,15 +34,26 @@
 static void
 prepare_urb( struct brw_context *brw )
 {
-   brw->urb.nr_vs_entries = 256;
-   brw->urb.nr_gs_entries = 256;
+   int urb_size, max_urb_entry;
+   struct intel_context *intel = &brw->intel;
+
+   if (IS_GT1(intel->intelScreen->deviceID)) {
+       urb_size = 32 * 1024;
+       max_urb_entry = 128;
+   } else {
+       urb_size = 64 * 1024;
+       max_urb_entry = 256;
+   }
+
+   brw->urb.nr_vs_entries = max_urb_entry;
+   brw->urb.nr_gs_entries = max_urb_entry;
 
    /* CACHE_NEW_VS_PROG */
    brw->urb.vs_size = MAX2(brw->vs.prog_data->urb_entry_size, 1);
 
-   if (256 * brw->urb.vs_size > 64 * 1024)
+   if (2 * brw->urb.vs_size > urb_size)
           brw->urb.nr_vs_entries = brw->urb.nr_gs_entries = 
-               (64 * 1024 ) / brw->urb.vs_size;
+               (urb_size ) / (2 * brw->urb.vs_size);
 }
 
 static void

diff --git a/src/mesa/drivers/dri/intel/intel_chipset.h b/src/mesa/drivers/dri/intel/intel_chipset.h
index 4fecdbed20390ab09d796322bfafca0067439e73..4ff9140d56e1e2d0800fb6f9ebea778ac1f8f1d0 100644 (file)
--- a/src/mesa/drivers/dri/intel/intel_chipset.h
+++ b/src/mesa/drivers/dri/intel/intel_chipset.h
@@ -133,6 +133,10 @@
                                 devid == PCI_CHIP_SANDYBRIDGE_M_GT2_PLUS || \
                                 devid == PCI_CHIP_SANDYBRIDGE_S)
 
+#define IS_GT1(devid)          (devid == PCI_CHIP_SANDYBRIDGE_GT1 || \
+                                devid == PCI_CHIP_SANDYBRIDGE_M_GT1 || \
+                                devid == PCI_CHIP_SANDYBRIDGE_S)
+
 #define IS_965(devid)          (IS_GEN4(devid) || \
                                 IS_G4X(devid) || \
                                 IS_GEN5(devid) || \