diff options
| author | Dave Airlie <airlied@redhat.com> | 2019-03-29 11:30:04 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2019-03-29 11:38:17 +1000 |
| commit | 233709186c502b48f53aa383fe78f7a9f0a74416 (patch) | |
| tree | 695012154a4e6ccf08e85dc008bf1ed974791c8a /include/drm | |
| parent | e0a3def2b15a4880ab84f8ad1cd7492fefb28ade (diff) | |
| parent | 00d082cc4ea6e42ec4fed832a1020231bb1ca150 (diff) | |
Merge tag 'du-next-20190328' of git://linuxtv.org/pinchartl/media into drm-next
R-Car DU miscellaneous changes for v5.2
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190328042035.GA4846@pendragon.ideasonboard.com
Diffstat (limited to 'include/drm')
| -rw-r--r-- | include/drm/drm_crtc.h | 2 | ||||
| -rw-r--r-- | include/drm/drm_framebuffer.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h index f7c3022dbdf4..58ad983d7cd6 100644 --- a/include/drm/drm_crtc.h +++ b/include/drm/drm_crtc.h @@ -78,7 +78,7 @@ struct drm_plane_helper_funcs; /** * struct drm_crtc_state - mutable CRTC state * - * Note that the distinction between @enable and @active is rather subtile: + * Note that the distinction between @enable and @active is rather subtle: * Flipping @active while @enable is set without changing anything else may * never return in a failure from the &drm_mode_config_funcs.atomic_check * callback. Userspace assumes that a DPMS On will always succeed. In other diff --git a/include/drm/drm_framebuffer.h b/include/drm/drm_framebuffer.h index f0b34c977ec5..c23016748e3f 100644 --- a/include/drm/drm_framebuffer.h +++ b/include/drm/drm_framebuffer.h @@ -32,6 +32,7 @@ struct drm_clip_rect; struct drm_device; struct drm_file; +struct drm_format_info; struct drm_framebuffer; struct drm_gem_object; |