From 31970ebff35bfd79df3a01565bf8f3084085bd02 Mon Sep 17 00:00:00 2001 From: Michael Witten Date: Thu, 25 Aug 2011 19:42:20 +0000 Subject: [PATCH] --- yaml --- r: 275211 b: refs/heads/master c: 9029bd7a42e3c32783866630ee3eb6b82e273544 h: refs/heads/master i: 275209: d269492fe4d5abcee2dd4fbc17c34a0401ba9e6a 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 210cb935c651..b4a43d1f835a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 54f2cb8fc930e08fd6156519b28c45d576615f82 +refs/heads/master: 9029bd7a42e3c32783866630ee3eb6b82e273544 diff --git a/trunk/Documentation/DocBook/drm.tmpl b/trunk/Documentation/DocBook/drm.tmpl index 3470c6b2f843..66a114a05c6f 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 - core GEM initialization. A UMA device usually has a so-called + core GEM initialization. A UMA device usually has what is called a "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