* drm tip conflict in intel_workarounds.c
@ 2018-12-06 2:25 Dave Airlie
2018-12-06 19:36 ` Rodrigo Vivi
0 siblings, 1 reply; 3+ messages in thread
From: Dave Airlie @ 2018-12-06 2:25 UTC (permalink / raw)
To: Jani Nikula, Tvrtko Ursulin, Daniel Vetter; +Cc: intel-gfx
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,
/* 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@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: drm tip conflict in intel_workarounds.c
2018-12-06 2:25 drm tip conflict in intel_workarounds.c Dave Airlie
@ 2018-12-06 19:36 ` Rodrigo Vivi
2018-12-07 8:49 ` Tvrtko Ursulin
0 siblings, 1 reply; 3+ messages in thread
From: Rodrigo Vivi @ 2018-12-06 19:36 UTC (permalink / raw)
To: Dave Airlie; +Cc: Jani Nikula, intel-gfx, Daniel Vetter
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@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: drm tip conflict in intel_workarounds.c
2018-12-06 19:36 ` Rodrigo Vivi
@ 2018-12-07 8:49 ` Tvrtko Ursulin
0 siblings, 0 replies; 3+ messages in thread
From: Tvrtko Ursulin @ 2018-12-07 8:49 UTC (permalink / raw)
To: Rodrigo Vivi, Dave Airlie; +Cc: Jani Nikula, Daniel Vetter, intel-gfx
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
>> 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.
Yes I've fixed it up yesterday with Daniel's help.
Regards,
Tvrtko
>>
>> /* 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@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-12-07 8:49 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-12-06 2:25 drm tip conflict in intel_workarounds.c Dave Airlie
2018-12-06 19:36 ` Rodrigo Vivi
2018-12-07 8:49 ` Tvrtko Ursulin
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.