[Mesa-stable] cherry-pick commit f83b9e58f6e8a748def367c7d523eb7285b1aeb7

[Mark Janes]

Please cherry-pick the commit

http://cgit.freedesktop.org/mesa/mesa/commit/?id=f83b9e58f6e8a748def367c7d523eb7285b1aeb7

For the 10.6 release.  It fixes the dEQP test:
functional.fbo.completeness.renderable.texture.stencil.stencil_index8
on BSW and BDW.

thanks,

Mark