From d269492fe4d5abcee2dd4fbc17c34a0401ba9e6a Mon Sep 17 00:00:00 2001 From: Michael Witten Date: Thu, 25 Aug 2011 19:37:24 +0000 Subject: [PATCH] --- yaml --- r: 275209 b: refs/heads/master c: 482b2ad8e488e609bb3bb408a8e9ca17b73b17c6 h: refs/heads/master i: 275207: bff59ec8415dcc589ff8ae1e01a8ef4a47cc8023 v: v3 --- [refs] | 2 +- trunk/Documentation/DocBook/drm.tmpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 7d350fc66d3e..edbe7e5bc489 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 049cc903e714a27805eae0c34a4c34902a385032 +refs/heads/master: 482b2ad8e488e609bb3bb408a8e9ca17b73b17c6 diff --git a/trunk/Documentation/DocBook/drm.tmpl b/trunk/Documentation/DocBook/drm.tmpl index 7c11d790f749..d385e902f5ff 100644 --- a/trunk/Documentation/DocBook/drm.tmpl +++ b/trunk/Documentation/DocBook/drm.tmpl @@ -455,7 +455,7 @@ a GTT DRM MM object, which provides an address space pool for object allocation. In a KMS configuration, the driver needs to allocate and initialize a command ring buffer following - basic GEM initialization. Most UMA devices have a so-called + core GEM initialization. Most UMA devices have a so-called "stolen" memory region, which provides space for the initial framebuffer and large, contiguous memory regions required by the device. This space is not typically managed by GEM, and must