aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/gpu/drm/i915/i915_gem_fence.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem_fence.c b/drivers/gpu/drm/i915/i915_gem_fence.c
index af1f8c461060..6f7249b00d4c 100644
--- a/drivers/gpu/drm/i915/i915_gem_fence.c
+++ b/drivers/gpu/drm/i915/i915_gem_fence.c
@@ -34,8 +34,8 @@
34 * set of these objects. 34 * set of these objects.
35 * 35 *
36 * Fences are used to detile GTT memory mappings. They're also connected to the 36 * Fences are used to detile GTT memory mappings. They're also connected to the
37 * hardware frontbuffer render tracking and hence interract with frontbuffer 37 * hardware frontbuffer render tracking and hence interact with frontbuffer
38 * conmpression. Furthermore on older platforms fences are required for tiled 38 * compression. Furthermore on older platforms fences are required for tiled
39 * objects used by the display engine. They can also be used by the render 39 * objects used by the display engine. They can also be used by the render
40 * engine - they're required for blitter commands and are optional for render 40 * engine - they're required for blitter commands and are optional for render
41 * commands. But on gen4+ both display (with the exception of fbc) and rendering 41 * commands. But on gen4+ both display (with the exception of fbc) and rendering
@@ -46,8 +46,8 @@
46 * 46 *
47 * Finally note that because fences are such a restricted resource they're 47 * Finally note that because fences are such a restricted resource they're
48 * dynamically associated with objects. Furthermore fence state is committed to 48 * dynamically associated with objects. Furthermore fence state is committed to
49 * the hardware lazily to avoid unecessary stalls on gen2/3. Therefore code must 49 * the hardware lazily to avoid unnecessary stalls on gen2/3. Therefore code must
50 * explictly call i915_gem_object_get_fence() to synchronize fencing status 50 * explicitly call i915_gem_object_get_fence() to synchronize fencing status
51 * for cpu access. Also note that some code wants an unfenced view, for those 51 * for cpu access. Also note that some code wants an unfenced view, for those
52 * cases the fence can be removed forcefully with i915_gem_object_put_fence(). 52 * cases the fence can be removed forcefully with i915_gem_object_put_fence().
53 * 53 *
@@ -532,7 +532,7 @@ void i915_gem_restore_fences(struct drm_device *dev)
532 * required. 532 * required.
533 * 533 *
534 * When bit 17 is XORed in, we simply refuse to tile at all. Bit 534 * When bit 17 is XORed in, we simply refuse to tile at all. Bit
535 * 17 is not just a page offset, so as we page an objet out and back in, 535 * 17 is not just a page offset, so as we page an object out and back in,
536 * individual pages in it will have different bit 17 addresses, resulting in 536 * individual pages in it will have different bit 17 addresses, resulting in
537 * each 64 bytes being swapped with its neighbor! 537 * each 64 bytes being swapped with its neighbor!
538 * 538 *