diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2012-05-17 07:27:20 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-05-22 05:34:33 -0400 |
| commit | 3b02ab8893d45f17ae104588e337188127068a92 (patch) | |
| tree | 27a83d4543233d151e8063ef75916897bca364a1 /include/drm | |
| parent | 4a1b0714275796fdbc35427cf361eb4123e5e9f6 (diff) | |
drm: Miscellaneous typo fixes and documentation updates
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'include/drm')
| -rw-r--r-- | include/drm/drmP.h | 10 | ||||
| -rw-r--r-- | include/drm/drm_crtc.h | 21 | ||||
| -rw-r--r-- | include/drm/drm_crtc_helper.h | 21 |
3 files changed, 33 insertions, 19 deletions
diff --git a/include/drm/drmP.h b/include/drm/drmP.h index efd12490376..e14a77c4e56 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h | |||
| @@ -755,11 +755,11 @@ struct drm_driver { | |||
| 755 | * @dev: DRM device | 755 | * @dev: DRM device |
| 756 | * @crtc: counter to fetch | 756 | * @crtc: counter to fetch |
| 757 | * | 757 | * |
| 758 | * Driver callback for fetching a raw hardware vblank counter | 758 | * Driver callback for fetching a raw hardware vblank counter for @crtc. |
| 759 | * for @crtc. If a device doesn't have a hardware counter, the | 759 | * If a device doesn't have a hardware counter, the driver can simply |
| 760 | * driver can simply return the value of drm_vblank_count and | 760 | * return the value of drm_vblank_count. The DRM core will account for |
| 761 | * make the enable_vblank() and disable_vblank() hooks into no-ops, | 761 | * missed vblank events while interrupts where disabled based on system |
| 762 | * leaving interrupts enabled at all times. | 762 | * timestamps. |
| 763 | * | 763 | * |
| 764 | * Wraparound handling and loss of events due to modesetting is dealt | 764 | * Wraparound handling and loss of events due to modesetting is dealt |
| 765 | * with in the DRM core code. | 765 | * with in the DRM core code. |
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h index d59bb7d9365..3ecee192db0 100644 --- a/include/drm/drm_crtc.h +++ b/include/drm/drm_crtc.h | |||
| @@ -294,20 +294,16 @@ struct drm_plane; | |||
| 294 | 294 | ||
| 295 | /** | 295 | /** |
| 296 | * drm_crtc_funcs - control CRTCs for a given device | 296 | * drm_crtc_funcs - control CRTCs for a given device |
| 297 | * @reset: reset CRTC after state has been invalidate (e.g. resume) | ||
| 298 | * @dpms: control display power levels | ||
| 299 | * @save: save CRTC state | 297 | * @save: save CRTC state |
| 300 | * @resore: restore CRTC state | 298 | * @restore: restore CRTC state |
| 301 | * @lock: lock the CRTC | 299 | * @reset: reset CRTC after state has been invalidate (e.g. resume) |
| 302 | * @unlock: unlock the CRTC | 300 | * @cursor_set: setup the cursor |
| 303 | * @shadow_allocate: allocate shadow pixmap | 301 | * @cursor_move: move the cursor |
| 304 | * @shadow_create: create shadow pixmap for rotation support | ||
| 305 | * @shadow_destroy: free shadow pixmap | ||
| 306 | * @mode_fixup: fixup proposed mode | ||
| 307 | * @mode_set: set the desired mode on the CRTC | ||
| 308 | * @gamma_set: specify color ramp for CRTC | 302 | * @gamma_set: specify color ramp for CRTC |
| 309 | * @destroy: deinit and free object | 303 | * @destroy: deinit and free object |
| 310 | * @set_property: called when a property is changed | 304 | * @set_property: called when a property is changed |
| 305 | * @set_config: apply a new CRTC configuration | ||
| 306 | * @page_flip: initiate a page flip | ||
| 311 | * | 307 | * |
| 312 | * The drm_crtc_funcs structure is the central CRTC management structure | 308 | * The drm_crtc_funcs structure is the central CRTC management structure |
| 313 | * in the DRM. Each CRTC controls one or more connectors (note that the name | 309 | * in the DRM. Each CRTC controls one or more connectors (note that the name |
| @@ -420,11 +416,8 @@ struct drm_crtc { | |||
| 420 | * @save: save connector state | 416 | * @save: save connector state |
| 421 | * @restore: restore connector state | 417 | * @restore: restore connector state |
| 422 | * @reset: reset connector after state has been invalidate (e.g. resume) | 418 | * @reset: reset connector after state has been invalidate (e.g. resume) |
| 423 | * @mode_valid: is this mode valid on the given connector? | ||
| 424 | * @mode_fixup: try to fixup proposed mode for this connector | ||
| 425 | * @mode_set: set this mode | ||
| 426 | * @detect: is this connector active? | 419 | * @detect: is this connector active? |
| 427 | * @get_modes: get mode list for this connector | 420 | * @fill_modes: fill mode list for this connector |
| 428 | * @set_property: property for this connector may need update | 421 | * @set_property: property for this connector may need update |
| 429 | * @destroy: make object go away | 422 | * @destroy: make object go away |
| 430 | * @force: notify the driver the connector is forced on | 423 | * @force: notify the driver the connector is forced on |
diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h index 3add00e0338..7988e55c98d 100644 --- a/include/drm/drm_crtc_helper.h +++ b/include/drm/drm_crtc_helper.h | |||
| @@ -44,6 +44,13 @@ enum mode_set_atomic { | |||
| 44 | ENTER_ATOMIC_MODE_SET, | 44 | ENTER_ATOMIC_MODE_SET, |
| 45 | }; | 45 | }; |
| 46 | 46 | ||
| 47 | /** | ||
| 48 | * drm_crtc_helper_funcs - helper operations for CRTCs | ||
| 49 | * @mode_fixup: try to fixup proposed mode for this connector | ||
| 50 | * @mode_set: set this mode | ||
| 51 | * | ||
| 52 | * The helper operations are called by the mid-layer CRTC helper. | ||
| 53 | */ | ||
| 47 | struct drm_crtc_helper_funcs { | 54 | struct drm_crtc_helper_funcs { |
| 48 | /* | 55 | /* |
| 49 | * Control power levels on the CRTC. If the mode passed in is | 56 | * Control power levels on the CRTC. If the mode passed in is |
| @@ -76,6 +83,13 @@ struct drm_crtc_helper_funcs { | |||
| 76 | void (*disable)(struct drm_crtc *crtc); | 83 | void (*disable)(struct drm_crtc *crtc); |
| 77 | }; | 84 | }; |
| 78 | 85 | ||
| 86 | /** | ||
| 87 | * drm_encoder_helper_funcs - helper operations for encoders | ||
| 88 | * @mode_fixup: try to fixup proposed mode for this connector | ||
| 89 | * @mode_set: set this mode | ||
| 90 | * | ||
| 91 | * The helper operations are called by the mid-layer CRTC helper. | ||
| 92 | */ | ||
| 79 | struct drm_encoder_helper_funcs { | 93 | struct drm_encoder_helper_funcs { |
| 80 | void (*dpms)(struct drm_encoder *encoder, int mode); | 94 | void (*dpms)(struct drm_encoder *encoder, int mode); |
| 81 | void (*save)(struct drm_encoder *encoder); | 95 | void (*save)(struct drm_encoder *encoder); |
| @@ -97,6 +111,13 @@ struct drm_encoder_helper_funcs { | |||
| 97 | void (*disable)(struct drm_encoder *encoder); | 111 | void (*disable)(struct drm_encoder *encoder); |
| 98 | }; | 112 | }; |
| 99 | 113 | ||
| 114 | /** | ||
| 115 | * drm_connector_helper_funcs - helper operations for connectors | ||
| 116 | * @get_modes: get mode list for this connector | ||
| 117 | * @mode_valid: is this mode valid on the given connector? | ||
| 118 | * | ||
| 119 | * The helper operations are called by the mid-layer CRTC helper. | ||
| 120 | */ | ||
| 100 | struct drm_connector_helper_funcs { | 121 | struct drm_connector_helper_funcs { |
| 101 | int (*get_modes)(struct drm_connector *connector); | 122 | int (*get_modes)(struct drm_connector *connector); |
| 102 | int (*mode_valid)(struct drm_connector *connector, | 123 | int (*mode_valid)(struct drm_connector *connector, |
