Mesa (18.1): i965/tex_image: Avoid the ASTC LDR workaround on gen9lp

[Dylan Baker]

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

Author: Nanley Chery <nanley.g.chery at intel.com>
Date:   Sat Feb 24 01:26:20 2018 -0800

i965/tex_image: Avoid the ASTC LDR workaround on gen9lp

Both the internal documentation and the results of testing this in the
CI suggest that this is unnecessary. Add the fixes tag because this
reduces an internal benchmark's startup time by about 17 seconds
(reported by Eero).

Fixes: 710b1d2e665 "i965/tex_image: Flush certain subnormal ASTC channel values"
Tested-by: Eero Tamminen <eero.t.tamminen at intel.com>
Acked-by: Kenneth Graunke <kenneth at whitecape.org>
(cherry picked from commit 3e56e4642fb5875b3f5c4eb34798ba9f3d827705)

---

 src/mesa/drivers/dri/i965/intel_tex_image.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mesa/drivers/dri/i965/intel_tex_image.c b/src/mesa/drivers/dri/i965/intel_tex_image.c
index e25bc9a0c0..a0408b304d 100644
--- a/src/mesa/drivers/dri/i965/intel_tex_image.c
+++ b/src/mesa/drivers/dri/i965/intel_tex_image.c
@@ -927,7 +927,7 @@ intelCompressedTexSubImage(struct gl_context *ctx, GLuint dims,
                         !_mesa_is_srgb_format(gl_format);
    struct brw_context *brw = (struct brw_context*) ctx;
    const struct gen_device_info *devinfo = &brw->screen->devinfo;
-   if (devinfo->gen == 9 && is_linear_astc)
+   if (devinfo->gen == 9 && !gen_device_info_is_9lp(devinfo) && is_linear_astc)
       flush_astc_denorms(ctx, dims, texImage,
                          xoffset, yoffset, zoffset,
                          width, height, depth);