diff options
| -rw-r--r-- | Documentation/DocBook/drm.tmpl | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Documentation/DocBook/drm.tmpl b/Documentation/DocBook/drm.tmpl index 7583dc7cf64d..910c923a9b86 100644 --- a/Documentation/DocBook/drm.tmpl +++ b/Documentation/DocBook/drm.tmpl | |||
| @@ -389,7 +389,7 @@ | |||
| 389 | </para> | 389 | </para> |
| 390 | <para> | 390 | <para> |
| 391 | If your driver supports memory management (it should!), you'll | 391 | If your driver supports memory management (it should!), you'll |
| 392 | need to set that up at load time as well. How you intialize | 392 | need to set that up at load time as well. How you initialize |
| 393 | it depends on which memory manager you're using, TTM or GEM. | 393 | it depends on which memory manager you're using, TTM or GEM. |
| 394 | </para> | 394 | </para> |
| 395 | <sect3> | 395 | <sect3> |
| @@ -399,7 +399,7 @@ | |||
| 399 | aperture space for graphics devices. TTM supports both UMA devices | 399 | aperture space for graphics devices. TTM supports both UMA devices |
| 400 | and devices with dedicated video RAM (VRAM), i.e. most discrete | 400 | and devices with dedicated video RAM (VRAM), i.e. most discrete |
| 401 | graphics devices. If your device has dedicated RAM, supporting | 401 | graphics devices. If your device has dedicated RAM, supporting |
| 402 | TTM is desireable. TTM also integrates tightly with your | 402 | TTM is desirable. TTM also integrates tightly with your |
| 403 | driver specific buffer execution function. See the radeon | 403 | driver specific buffer execution function. See the radeon |
| 404 | driver for examples. | 404 | driver for examples. |
| 405 | </para> | 405 | </para> |
| @@ -443,7 +443,7 @@ | |||
| 443 | likely eventually calling ttm_bo_global_init and | 443 | likely eventually calling ttm_bo_global_init and |
| 444 | ttm_bo_global_release, respectively. Also like the previous | 444 | ttm_bo_global_release, respectively. Also like the previous |
| 445 | object, ttm_global_item_ref is used to create an initial reference | 445 | object, ttm_global_item_ref is used to create an initial reference |
| 446 | count for the TTM, which will call your initalization function. | 446 | count for the TTM, which will call your initialization function. |
| 447 | </para> | 447 | </para> |
| 448 | </sect3> | 448 | </sect3> |
| 449 | <sect3> | 449 | <sect3> |
| @@ -557,7 +557,7 @@ void intel_crt_init(struct drm_device *dev) | |||
| 557 | CRT connector and encoder combination is created. A device | 557 | CRT connector and encoder combination is created. A device |
| 558 | specific i2c bus is also created, for fetching EDID data and | 558 | specific i2c bus is also created, for fetching EDID data and |
| 559 | performing monitor detection. Once the process is complete, | 559 | performing monitor detection. Once the process is complete, |
| 560 | the new connector is regsitered with sysfs, to make its | 560 | the new connector is registered with sysfs, to make its |
| 561 | properties available to applications. | 561 | properties available to applications. |
| 562 | </para> | 562 | </para> |
| 563 | <sect4> | 563 | <sect4> |
| @@ -581,12 +581,12 @@ void intel_crt_init(struct drm_device *dev) | |||
| 581 | <para> | 581 | <para> |
| 582 | For each encoder, CRTC and connector, several functions must | 582 | For each encoder, CRTC and connector, several functions must |
| 583 | be provided, depending on the object type. Encoder objects | 583 | be provided, depending on the object type. Encoder objects |
| 584 | need should provide a DPMS (basically on/off) function, mode fixup | 584 | need to provide a DPMS (basically on/off) function, mode fixup |
| 585 | (for converting requested modes into native hardware timings), | 585 | (for converting requested modes into native hardware timings), |
| 586 | and prepare, set and commit functions for use by the core DRM | 586 | and prepare, set and commit functions for use by the core DRM |
| 587 | helper functions. Connector helpers need to provide mode fetch and | 587 | helper functions. Connector helpers need to provide mode fetch and |
| 588 | validity functions as well as an encoder matching function for | 588 | validity functions as well as an encoder matching function for |
| 589 | returing an ideal encoder for a given connector. The core | 589 | returning an ideal encoder for a given connector. The core |
| 590 | connector functions include a DPMS callback, (deprecated) | 590 | connector functions include a DPMS callback, (deprecated) |
| 591 | save/restore routines, detection, mode probing, property handling, | 591 | save/restore routines, detection, mode probing, property handling, |
| 592 | and cleanup functions. | 592 | and cleanup functions. |
