<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On Fri, Feb 9, 2018 at 3:43 PM, Jason Ekstrand <span dir="ltr"><<a href="mailto:jason@jlekstrand.net" target="_blank">jason@jlekstrand.net</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">From: Louis-Francis Ratté-Boulianne <<a href="mailto:lfrb@collabora.com">lfrb@collabora.com</a>><br>
<br>
This was breaking CCS support as because we would take the planar path<br>
whenever planar_format is set which is always.<br>
<br>
Signed-off-by: Louis-Francis Ratté-Boulianne <<a href="mailto:lfrb@collabora.com">lfrb@collabora.com</a>><br>
Reviewed-by: Jason Ekstrand <<a href="mailto:jason@jlekstrand.net">jason@jlekstrand.net</a>><br></blockquote><div><br></div><div>Scratch that. I ran it through Jenkins and it breaks PBOs rather badly. I just sent a new patch which should fix this properly.<br><br></div><div>--Jason<br></div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
---<br>
src/mesa/drivers/dri/i965/<wbr>intel_screen.c | 3 ++-<br>
1 file changed, 2 insertions(+), 1 deletion(-)<br>
<br>
diff --git a/src/mesa/drivers/dri/i965/<wbr>intel_screen.c b/src/mesa/drivers/dri/i965/<wbr>intel_screen.c<br>
index 61d3331..92d9e28 100644<br>
--- a/src/mesa/drivers/dri/i965/<wbr>intel_screen.c<br>
+++ b/src/mesa/drivers/dri/i965/<wbr>intel_screen.c<br>
@@ -1318,7 +1318,8 @@ intel_from_planar(__DRIimage *parent, int plane, void *loaderPrivate)<br>
<br>
if (parent == NULL) {<br>
return NULL;<br>
- } else if (parent->planar_format == NULL) {<br>
+ } else if (parent->planar_format == NULL ||<br>
+ parent->planar_format->nplanes == 1) {<br>
const bool is_aux =<br>
isl_drm_modifier_has_aux(<wbr>parent->modifier) && plane == 1;<br>
if (!is_aux)<br>
<span class="HOEnZb"><font color="#888888">--<br>
2.5.0.400.gff86faf<br>
<br>
</font></span></blockquote></div><br></div></div>