summaryrefslogtreecommitdiffstats
path: root/Documentation/DocBook/drm.tmpl
diff options
context:
space:
mode:
authorMichael Witten <mfwitten@gmail.com>2011-08-29 17:38:48 +0000
committerMichael Witten <mfwitten@gmail.com>2011-08-29 20:00:28 +0000
commite355b2014da06458385902c47edf193a997895fc (patch)
tree8a216572ab774da8a308516f4daca51d99962a50 /Documentation/DocBook/drm.tmpl
parentb8c6e0fe46fcd60f58089365dd96dcf04f95263b (diff)
downloadlinux-e355b2014da06458385902c47edf193a997895fc.tar.gz
linux-e355b2014da06458385902c47edf193a997895fc.tar.bz2
linux-e355b2014da06458385902c47edf193a997895fc.zip
DocBook/drm: Better flow with `, and then'
Signed-off-by: Michael Witten <mfwitten@gmail.com>
Diffstat (limited to 'Documentation/DocBook/drm.tmpl')
-rw-r--r--Documentation/DocBook/drm.tmpl4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/DocBook/drm.tmpl b/Documentation/DocBook/drm.tmpl
index 9ae328aa1dd3..0b6c59d6aa5f 100644
--- a/Documentation/DocBook/drm.tmpl
+++ b/Documentation/DocBook/drm.tmpl
@@ -735,8 +735,8 @@ void intel_crt_init(struct drm_device *dev)
<para>
Perhaps the most important GEM function is providing a command
execution interface to clients. Client programs construct command
- buffers containing references to previously allocated memory objects
- and submit them to GEM. At that point, GEM takes care to bind
+ buffers containing references to previously allocated memory objects,
+ and then submit them to GEM. At that point, GEM takes care to bind
all the objects into the GTT, execute the buffer, and provide
necessary synchronization between clients accessing the same buffers.
This often involves evicting some objects from the GTT and re-binding