diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-01-27 08:54:11 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-01-27 08:54:11 +1000 |
| commit | e4514003c6d0afd0a2d7e23e397530d746f34057 (patch) | |
| tree | 0a87f4514fc938b2f9df5a731f03fb1c23c11a3e /include/drm | |
| parent | bdfcea4bdcd354023b1a93abdaf6b176c3dd545b (diff) | |
| parent | b7703726251191cd9f3ef3a80b2d9667901eec95 (diff) | |
Merge tag 'topic/core-stuff-2015-01-23' of git://anongit.freedesktop.org/drm-intel into drm-next
Just flushing out my drm-misc branch, nothing major. Well too old patches
I've dug out from years since a patch from Rob look eerily familiar ;-)
* tag 'topic/core-stuff-2015-01-23' of git://anongit.freedesktop.org/drm-intel:
drm/probe-helper: clamp unknown connector status in the poll work
drm/probe-helper: don't lose hotplug event
next: drm/atomic: Use copy_from_user to copy 64 bit data from user space
drm: Make drm_read() more robust against multithreaded races
drm/fb-helper: Propagate errors from initial config failure
drm: Drop superfluous "select VT_HW_CONSOLE_BINDING"
Diffstat (limited to 'include/drm')
| -rw-r--r-- | include/drm/drm_crtc.h | 1 | ||||
| -rw-r--r-- | include/drm/drm_fb_helper.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h index 0ecfb7c8060..ac55ab0dc88 100644 --- a/include/drm/drm_crtc.h +++ b/include/drm/drm_crtc.h @@ -1093,6 +1093,7 @@ struct drm_mode_config { /* output poll support */ bool poll_enabled; bool poll_running; + bool delayed_event; struct delayed_work output_poll_work; /* pointers to standard properties */ diff --git a/include/drm/drm_fb_helper.h b/include/drm/drm_fb_helper.h index b597068103a..21b944c456f 100644 --- a/include/drm/drm_fb_helper.h +++ b/include/drm/drm_fb_helper.h @@ -125,7 +125,7 @@ void drm_fb_helper_fill_fix(struct fb_info *info, uint32_t pitch, int drm_fb_helper_setcmap(struct fb_cmap *cmap, struct fb_info *info); int drm_fb_helper_hotplug_event(struct drm_fb_helper *fb_helper); -bool drm_fb_helper_initial_config(struct drm_fb_helper *fb_helper, int bpp_sel); +int drm_fb_helper_initial_config(struct drm_fb_helper *fb_helper, int bpp_sel); int drm_fb_helper_single_add_all_connectors(struct drm_fb_helper *fb_helper); int drm_fb_helper_debug_enter(struct fb_info *info); int drm_fb_helper_debug_leave(struct fb_info *info); |