diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-09-15 19:55:55 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-09-15 19:55:55 +1000 |
| commit | 19524f7c59c19854caf5b82d89bc558e38da5790 (patch) | |
| tree | 92abeba64bc3aa9f4bde7e6d98d8215602069b18 /include/drm | |
| parent | 98faa78ce7f1f986e11e7805d31b409782a6d2d4 (diff) | |
| parent | d0fa1af40e784aaf7ebb7ba8a17b229bb3fa4c21 (diff) | |
Merge tag 'topic/core-stuff-2014-09-15' of git://anongit.freedesktop.org/drm-intel into drm-next
Here's the updated topic/core-stuff pull request with the two patches
already merged into drm-fixes dropped.
* tag 'topic/core-stuff-2014-09-15' of git://anongit.freedesktop.org/drm-intel:
drm: Drop modeset locking from crtc init function
drm/i915/hdmi: Enable pipe pixel replication for SD interlaced modes
drm/edid: Reduce horizontal timings for pixel replicated modes
drm: Include task->name and master status in debugfs clients info
drm/gem: Fix kerneldoc typo
drm: use c99 initializers in structures
drm: fix drm_modeset_lock.h kernel-doc notation
Diffstat (limited to 'include/drm')
| -rw-r--r-- | include/drm/drm_modeset_lock.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/drm/drm_modeset_lock.h b/include/drm/drm_modeset_lock.h index a3f736d24382..75a5c45e21c7 100644 --- a/include/drm/drm_modeset_lock.h +++ b/include/drm/drm_modeset_lock.h @@ -29,7 +29,7 @@ struct drm_modeset_lock; /** - * drm_modeset_acquire_ctx - locking context (see ww_acquire_ctx) + * struct drm_modeset_acquire_ctx - locking context (see ww_acquire_ctx) * @ww_ctx: base acquire ctx * @contended: used internally for -EDEADLK handling * @locked: list of held locks @@ -61,7 +61,7 @@ struct drm_modeset_acquire_ctx { }; /** - * drm_modeset_lock - used for locking modeset resources. + * struct drm_modeset_lock - used for locking modeset resources. * @mutex: resource locking * @head: used to hold it's place on state->locked list when * part of an atomic update |