<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On Fri, Aug 4, 2017 at 1:08 PM, Jordan Justen <span dir="ltr"><<a href="mailto:jordan.l.justen@intel.com" target="_blank">jordan.l.justen@intel.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><span class="">On 2017-08-02 13:35:33, Jason Ekstrand wrote:<br>
> Originally, I had moved it to the caller to make some things easier when<br>
> adding the CCS modifier.  However, this broke DRI2 because<br>
> intel_process_dri2_buffer calls intel_miptree_create_for_bo but never<br>
> calls intel_miptree_alloc_aux.  Also, in hindsight, it should be pretty<br>
> easy to make the CCS modifier stuff work even if create_for_bo allocates<br>
> the CCS when DISABLE_AUX is not set.<br>
><br>
> Bugzilla: <a href="https://bugs.freedesktop.org/show_bug.cgi?id=101925" rel="noreferrer" target="_blank">https://bugs.freedesktop.org/<wbr>show_bug.cgi?id=101925</a><br>
<br>
</span>I guess you want to drop this based on Tapani's feedback.<br></blockquote><div><br></div><div>Yup<br></div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Reviewed-by: Jordan Justen <<a href="mailto:jordan.l.justen@intel.com">jordan.l.justen@intel.com</a>><br><div><div class="h5"></div></div></blockquote><div><br></div><div>Thanks!<br></div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div><div class="h5">
> Cc: Tapani Palli <<a href="mailto:tapani.palli@intel.com">tapani.palli@intel.com</a>><br>
> Cc: "17.2" <<a href="mailto:mesa-stable@lists.freedesktop.org">mesa-stable@lists.<wbr>freedesktop.org</a>><br>
> ---<br>
>  src/mesa/drivers/dri/i965/<wbr>intel_mipmap_tree.c | 13 +++++++------<br>
>  1 file changed, 7 insertions(+), 6 deletions(-)<br>
><br>
> diff --git a/src/mesa/drivers/dri/i965/<wbr>intel_mipmap_tree.c b/src/mesa/drivers/dri/i965/<wbr>intel_mipmap_tree.c<br>
> index 910bb46..305912c 100644<br>
> --- a/src/mesa/drivers/dri/i965/<wbr>intel_mipmap_tree.c<br>
> +++ b/src/mesa/drivers/dri/i965/<wbr>intel_mipmap_tree.c<br>
> @@ -839,9 +839,15 @@ intel_miptree_create_for_bo(<wbr>struct brw_context *brw,<br>
>     mt->bo = bo;<br>
>     mt->offset = offset;<br>
><br>
> -   if (!(layout_flags & MIPTREE_LAYOUT_DISABLE_AUX))<br>
> +   if (!(layout_flags & MIPTREE_LAYOUT_DISABLE_AUX)) {<br>
>        intel_miptree_choose_aux_<wbr>usage(brw, mt);<br>
><br>
> +      if (!intel_miptree_alloc_aux(brw, mt)) {<br>
> +         intel_miptree_release(&mt);<br>
> +         return NULL;<br>
> +      }<br>
> +   }<br>
> +<br>
>     return mt;<br>
>  }<br>
><br>
> @@ -978,11 +984,6 @@ intel_miptree_create_for_dri_<wbr>image(struct brw_context *brw,<br>
>     if (is_winsys_image)<br>
>        image->bo->cache_coherent = false;<br>
><br>
> -   if (!intel_miptree_alloc_aux(brw, mt)) {<br>
> -      intel_miptree_release(&mt);<br>
> -      return NULL;<br>
> -   }<br>
> -<br>
>     return mt;<br>
>  }<br>
><br>
> --<br>
> 2.5.0.400.gff86faf<br>
><br>
</div></div>> ______________________________<wbr>_________________<br>
> mesa-dev mailing list<br>
> <a href="mailto:mesa-dev@lists.freedesktop.org">mesa-dev@lists.freedesktop.org</a><br>
> <a href="https://lists.freedesktop.org/mailman/listinfo/mesa-dev" rel="noreferrer" target="_blank">https://lists.freedesktop.org/<wbr>mailman/listinfo/mesa-dev</a><br>
</blockquote></div><br></div></div>