diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-05-16 03:47:13 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-05-16 03:47:13 +0200 |
| commit | 425a9a3ad1e64a00b4dbc827ae58df2aaf10ef43 (patch) | |
| tree | 24486fa04e292f875b7944f7086527819e72862b /include/drm/drm_crtc_helper.h | |
| parent | drm: fix memory leak around mode_group (v2) (diff) | |
| parent | drm: Make drm_crtc_helper_disable() return void (diff) | |
| download | linux-425a9a3ad1e64a00b4dbc827ae58df2aaf10ef43.tar.xz linux-425a9a3ad1e64a00b4dbc827ae58df2aaf10ef43.zip | |
Merge tag 'topic/core-stuff-2014-05-05' of git://anongit.freedesktop.org/drm-intel into drm-next
Update pull request with drm core patches. Mostly some polish for the
primary plane stuff and a pile of patches all over from Thierry. Has
survived a few days in drm-intel-nightly without causing ill.
I've frobbed my scripts a bit to also tag my topic branches so that you
have something stable to pull - I've accidentally pushed a bunch more
patches onto this branch before you've taken the old pull request.
* tag 'topic/core-stuff-2014-05-05' of git://anongit.freedesktop.org/drm-intel:
drm: Make drm_crtc_helper_disable() return void
drm: Fix indentation of closing brace
drm/dp: Fix typo in comment
drm: Fixup flip-work kerneldoc
drm/fb: Fix typos
drm/edid: Cleanup kerneldoc
drm/edid: Drop revision argument for drm_mode_std()
drm: Try to acquire modeset lock on panic or sysrq
drm: remove unused argument from drm_open_helper
drm: Handle ->disable_plane failures correctly
drm: Simplify fb refcounting rules around ->update_plane
drm/crtc-helper: gc usless connector loop in disable_unused_functions
drm/plane_helper: don't disable plane in destroy function
drm/plane-helper: Fix primary plane scaling check
drm: make mode_valid callback optional
drm/edid: Fill PAR in AVI infoframe based on CEA mode list
Diffstat (limited to 'include/drm/drm_crtc_helper.h')
| -rw-r--r-- | include/drm/drm_crtc_helper.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h index f51c8393e9a8..a3d75fefd010 100644 --- a/include/drm/drm_crtc_helper.h +++ b/include/drm/drm_crtc_helper.h @@ -114,7 +114,7 @@ struct drm_encoder_helper_funcs { /** * drm_connector_helper_funcs - helper operations for connectors * @get_modes: get mode list for this connector - * @mode_valid: is this mode valid on the given connector? + * @mode_valid (optional): is this mode valid on the given connector? * * The helper operations are called by the mid-layer CRTC helper. */ |