drm/i915: Move Braswell stop_machine GGTT insertion workaround

There was a silent conflict between

commit 0a878716265e9af9f697264dc2e858fcc060d833
Author: Daniel Vetter <[email protected]>
Date:   Thu Oct 15 14:23:01 2015 +0200

    drm/i915: restore ggtt double-bind avoidance

and

commit 5bab6f60cb4d1417ad7c599166bcfec87529c1a2
Author: Chris Wilson <[email protected]>
Date:   Fri Oct 23 18:43:32 2015 +0100

    drm/i915: Serialise updates to GGTT with access through GGTT on Braswell

thankfully caught by the extra WARN safegaurd in 0a878716. Since we now
override the GGTT insert_pages callback when installing the aliasing
ppgtt, we assert that the callback is the original ggtt routine.
However, on Braswell we now use a different insertion routine to
serialise access through the GGTT with updating the PTE and hence the
conflict. To avoid the conflict, move the custom insertion routine for
Braswell down a level.

Reported-by: Ville Syrjälä <[email protected]
Signed-off-by: Chris Wilson <[email protected]>
Cc: Ville Syrjälä <[email protected]
Cc: Daniel Vetter <[email protected]>
Cc: Michel Thierry <[email protected]>
Cc: Mika Kuoppala <[email protected]>
Link: http://patchwork.freedesktop.org/patch/msgid/[email protected]
Reviewed-by: Ville Syrjälä <[email protected]>
Tested-by: Ville Syrjälä <[email protected]>
Cc: [email protected]
Signed-off-by: Daniel Vetter <[email protected]>
(cherry picked from commit c140330b5e6b5bc2262ffb2f50bfeea06a482699)
Signed-off-by: Jani Nikula <[email protected]>

0 files changed, 0 insertions, 0 deletions