[Intel-gfx] drm tip conflict in intel_workarounds.c

2018-12-05 Thread Dave Airlie
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 some

Re: [Intel-gfx] drm tip conflict in intel_workarounds.c

2018-12-06 Thread Rodrigo Vivi
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

Re: [Intel-gfx] drm tip conflict in intel_workarounds.c

2018-12-07 Thread Tvrtko Ursulin
On 06/12/2018 19:36, Rodrigo Vivi wrote: 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