On Thu, Dec 06, 2018 at 12:25:48PM +1000, Dave Airlie wrote: > I merged the i915 tree into drm-next this morning, but got a major > conflict on the drm-tip rebuild in intel_workarounds.c. > > I'm not sure if I did wrong thing, but there were a couple of places > where the code seemed inconsistent and I couldn't track down what was > actually wanted. I'd appreciate someone checking my work on what is in > current drm-tip, what is currently on drm-tip looks sane to me. > > /* Wa_1604302699:icl */ > + wa_write_or(wal, > + GEN10_L3_CHICKEN_MODE_REGISTER, > + GEN11_I2M_WRITE_DISABLE); > > and > > - > - /* Wa_1406609255:icl (pre-prod) */ > - if (IS_ICL_REVID(i915, ICL_REVID_A0, ICL_REVID_B0)) > - wa_write_or(wal, > - GEN7_SARCHKMD, > - GEN7_DISABLE_DEMAND_PREFETCH | > - GEN7_DISABLE_SAMPLER_PREFETCH); > > were the two problems I was seeing. > > Dave. > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@xxxxxxxxxxxxxxxxxxxxx > https://lists.freedesktop.org/mailman/listinfo/intel-gfx _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
