Mesa (master): intel: check for LLC support when reading maps

[Eugeni Dodonov]

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

Author: Eugeni Dodonov <eugeni.dodonov at intel.com>
Date:   Wed Feb  1 18:24:23 2012 -0200

intel: check for LLC support when reading maps

This checks for advertised LLC support by the GPU instead of relying on
the GPU generation for detection.

Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Signed-off-by: Eugeni Dodonov <eugeni.dodonov at intel.com>

---

 src/mesa/drivers/dri/intel/intel_mipmap_tree.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/mesa/drivers/dri/intel/intel_mipmap_tree.c b/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
index eae79c1..5290da4 100644
--- a/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
+++ b/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
@@ -1052,7 +1052,7 @@ intel_miptree_map(struct intel_context *intel,
       intel_miptree_map_s8(intel, mt, map, level, slice);
    } else if (mt->stencil_mt) {
       intel_miptree_map_depthstencil(intel, mt, map, level, slice);
-   } else if (intel->gen >= 6 &&
+   } else if (intel->has_llc &&
 	      !(mode & GL_MAP_WRITE_BIT) &&
 	      !mt->compressed &&
 	      mt->region->tiling == I915_TILING_X) {