]> git.baikalelectronics.ru Git - kernel.git/commit
drm/i915: Move Braswell stop_machine GGTT insertion workaround
authorChris Wilson <chris@chris-wilson.co.uk>
Wed, 18 Nov 2015 15:19:39 +0000 (15:19 +0000)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Mon, 21 Dec 2015 10:17:56 +0000 (11:17 +0100)
commit001de9ce40b56eceeb1c6463e5cb43210211225f
tree745cb6a3af8611f8ca616291a6441d2231d3f023
parentefde5a18c80c89a3f312a99db59ff47e765cf9c9
drm/i915: Move Braswell stop_machine GGTT insertion workaround

There was a silent conflict between

commit db458f0b4d04e3d41f9506f29ce9a7eb78e97082
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date:   Thu Oct 15 14:23:01 2015 +0200

    drm/i915: restore ggtt double-bind avoidance

and

commit 8d9e01dc34a34fa182e46f726e2a4eca7273899c
Author: Chris Wilson <chris@chris-wilson.co.uk>
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 db458f0b. 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ä <ville.syrjala@linux.intel.com
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Michel Thierry <michel.thierry@intel.com>
Cc: Mika Kuoppala <mika.kuoppala@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1447859979-20107-1-git-send-email-chris@chris-wilson.co.uk
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Tested-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: drm-intel-fixes@lists.freedesktop.org
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/i915_gem_gtt.c