<div dir="ltr">Reviewed-by: Jason Ekstrand <<a href="mailto:jason@jlekstrand.net">jason@jlekstrand.net</a>><br></div><div class="gmail_extra"><br><div class="gmail_quote">On Fri, Jun 2, 2017 at 4:06 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"><div dir="ltr"><div class="gmail_extra"><div class="gmail_quote"><span class="">On Mon, May 22, 2017 at 9:54 AM, Rafael Antognolli <span dir="ltr"><<a href="mailto:rafael.antognolli@intel.com" target="_blank">rafael.antognolli@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>On Tue, May 16, 2017 at 04:01:30PM -0700, Anuj Phogat wrote:<br> > On Tue, May 16, 2017 at 10:34 AM, Anuj Phogat <<a href="mailto:anuj.phogat@gmail.com" target="_blank">anuj.phogat@gmail.com</a>> wrote:<br> > > CNL MOCS defines are duplicates of SKL MOCS defines.<br> > ><br> > I can actually drop this patch and continue using SKL MOCS defines for gen10+.<br> > I also noticed that vulkan needs separate MOCS defines for each gen. Any<br> > preferences for GL driver?<br></span></blockquote><div><br></div></span><div>Let's have separate #defines. That way we can change it later if we want.<br></div><span class=""><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><span> </span>I liked the way the vulkan driver does it, and would like to make the GL<br> driver do the same, at least on the gen specific code. That said, I don't have<br> a preference regarding keeping it or dropping it.<br></blockquote><div><br></div></span><div>Vulkan may be moving more towards the integers and away from the structs. Integers are easier to deal with in a lot of cases.<br></div><div><div class="h5"><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> Also consider it:<br> <br> Reviewed-by: Rafael Antognolli <<a href="mailto:rafael.antognolli@intel.com" target="_blank">rafael.antognolli@intel.com</a>><br> <div class="m_-3265239716688569444HOEnZb"><div class="m_-3265239716688569444h5"><br> > > V2: Rebased.<br> > ><br> > > Signed-off-by: Anuj Phogat <<a href="mailto:anuj.phogat@gmail.com" target="_blank">anuj.phogat@gmail.com</a>><br> > > ---<br> > > src/mesa/drivers/dri/i965/brw_<wbr>blorp.c | 6 +++---<br> > > src/mesa/drivers/dri/i965/brw_<wbr>state.h | 8 ++++++++<br> > > src/mesa/drivers/dri/i965/brw_<wbr>wm_surface_state.c | 2 ++<br> > > src/mesa/drivers/dri/i965/genX<wbr>_state_upload.c | 4 +++-<br> > > 4 files changed, 16 insertions(+), 4 deletions(-)<br> > ><br> > > diff --git a/src/mesa/drivers/dri/i965/br<wbr>w_blorp.c b/src/mesa/drivers/dri/i965/br<wbr>w_blorp.c<br> > > index 8d3bcbb..bcc72df 100644<br> > > --- a/src/mesa/drivers/dri/i965/br<wbr>w_blorp.c<br> > > +++ b/src/mesa/drivers/dri/i965/br<wbr>w_blorp.c<br> > > @@ -100,9 +100,9 @@ brw_blorp_init(struct brw_context *brw)<br> > > brw->blorp.exec = gen9_blorp_exec;<br> > > break;<br> > > case 10:<br> > > - brw->blorp.mocs.tex = SKL_MOCS_WB;<br> > > - brw->blorp.mocs.rb = SKL_MOCS_PTE;<br> > > - brw->blorp.mocs.vb = SKL_MOCS_WB;<br> > > + brw->blorp.mocs.tex = CNL_MOCS_WB;<br> > > + brw->blorp.mocs.rb = CNL_MOCS_PTE;<br> > > + brw->blorp.mocs.vb = CNL_MOCS_WB;<br> > > brw->blorp.exec = gen10_blorp_exec;<br> > > break;<br> > > default:<br> > > diff --git a/src/mesa/drivers/dri/i965/br<wbr>w_state.h b/src/mesa/drivers/dri/i965/br<wbr>w_state.h<br> > > index 4592e3e..4503946 100644<br> > > --- a/src/mesa/drivers/dri/i965/br<wbr>w_state.h<br> > > +++ b/src/mesa/drivers/dri/i965/br<wbr>w_state.h<br> > > @@ -410,6 +410,14 @@ void upload_gs_state_for_tf(struct brw_context *brw);<br> > > /* TC=LLC/eLLC, LeCC=PTE, LRUM=3, L3CC=WB */<br> > > #define SKL_MOCS_PTE (1 << 1)<br> > ><br> > > +/* Cannonlake: MOCS is now an index into an array of 62 different caching<br> > > + * configurations programmed by the kernel.<br> > > + */<br> > > +/* TC=LLC/eLLC, LeCC=WB, LRUM=3, L3CC=WB */<br> > > +#define CNL_MOCS_WB (2 << 1)<br> > > +/* TC=LLC/eLLC, LeCC=PTE, LRUM=3, L3CC=WB */<br> > > +#define CNL_MOCS_PTE (1 << 1)<br> > > +<br> > > #ifdef __cplusplus<br> > > }<br> > > #endif<br> > > diff --git a/src/mesa/drivers/dri/i965/br<wbr>w_wm_surface_state.c b/src/mesa/drivers/dri/i965/br<wbr>w_wm_surface_state.c<br> > > index c95fb37..c1003cd 100644<br> > > --- a/src/mesa/drivers/dri/i965/br<wbr>w_wm_surface_state.c<br> > > +++ b/src/mesa/drivers/dri/i965/br<wbr>w_wm_surface_state.c<br> > > @@ -64,12 +64,14 @@ uint32_t tex_mocs[] = {<br> > > [7] = GEN7_MOCS_L3,<br> > > [8] = BDW_MOCS_WB,<br> > > [9] = SKL_MOCS_WB,<br> > > + [10] = CNL_MOCS_WB,<br> > > };<br> > ><br> > > uint32_t rb_mocs[] = {<br> > > [7] = GEN7_MOCS_L3,<br> > > [8] = BDW_MOCS_PTE,<br> > > [9] = SKL_MOCS_PTE,<br> > > + [10] = CNL_MOCS_PTE,<br> > > };<br> > ><br> > > static void<br> > > diff --git a/src/mesa/drivers/dri/i965/ge<wbr>nX_state_upload.c b/src/mesa/drivers/dri/i965/ge<wbr>nX_state_upload.c<br> > > index 6619d4d..5710878 100644<br> > > --- a/src/mesa/drivers/dri/i965/ge<wbr>nX_state_upload.c<br> > > +++ b/src/mesa/drivers/dri/i965/ge<wbr>nX_state_upload.c<br> > > @@ -333,7 +333,9 @@ genX(emit_vertex_buffer_state)<wbr>(struct brw_context *brw,<br> > > #endif<br> > > #endif<br> > ><br> > > -#if GEN_GEN == 9<br> > > +#if GEN_GEN == 10<br> > > + .VertexBufferMOCS = CNL_MOCS_WB,<br> > > +#elif GEN_GEN == 9<br> > > .VertexBufferMOCS = SKL_MOCS_WB,<br> > > #elif GEN_GEN == 8<br> > > .VertexBufferMOCS = BDW_MOCS_WB,<br> > > --<br> > > 2.9.3<br> > ><br> > ______________________________<wbr>_________________<br> > mesa-dev mailing list<br> > <a href="mailto:mesa-dev@lists.freedesktop.org" target="_blank">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> ______________________________<wbr>_________________<br> mesa-dev mailing list<br> <a href="mailto:mesa-dev@lists.freedesktop.org" target="_blank">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> </div></div></blockquote></div></div></div><br></div></div> </blockquote></div><br></div>