diff options
| author | Sinclair Yeh <syeh@vmware.com> | 2017-09-07 21:27:23 +0200 |
|---|---|---|
| committer | Sinclair Yeh <syeh@vmware.com> | 2017-10-25 12:03:53 -0700 |
| commit | 6c67b7bf25d837e8610650932195c096f1dd6bc2 (patch) | |
| tree | 13b5e196150e5b8911859e770ec1ccf9622e98b2 /drm_crtc_helper.h | |
| parent | 749baed003d4f8eab1a1b03d03048110fbd0d7f0 (diff) | |
vmwgfx: Update stand alone to v4.12
Mostly straight copy-and-paste from upstream, with the following
notable changes
* Added #undef CONFIG_DEBUG_FS in drmP.h to exclude all debugfs code
* Minor updates to a few vmwgfx files due to API change
* Carried over from the v4.11 update: Skipped update to drm_mm and
drm_vma_manager because the switch to using interval tree makes
porting difficult
* Added #include <linux/highuid.h> to drm_ioctl.c to make CentOS
build
* Rolled in [Commit 3bacf4361cd0: drm/vmwgfx: Fix fbdev emulation
using legacy functions]
* Updated vmwgfx code to match upstream v4.12 code
Signed-off-by: Sinclair Yeh <syeh@vmware.com>
Reviewed-by: Deepak Rawat <drawat@vmware.com>
Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com>
Diffstat (limited to 'drm_crtc_helper.h')
| -rw-r--r-- | drm_crtc_helper.h | 42 |
1 files changed, 23 insertions, 19 deletions
diff --git a/drm_crtc_helper.h b/drm_crtc_helper.h index 1769db7..624030f 100644 --- a/drm_crtc_helper.h +++ b/drm_crtc_helper.h @@ -43,18 +43,19 @@ #include "drm_modeset_helper_vtables.h" #include "drm_modeset_helper.h" -extern void drm_helper_disable_unused_functions(struct drm_device *dev); -extern int drm_crtc_helper_set_config(struct drm_mode_set *set); -extern bool drm_crtc_helper_set_mode(struct drm_crtc *crtc, - struct drm_display_mode *mode, - int x, int y, - struct drm_framebuffer *old_fb); -extern bool drm_helper_crtc_in_use(struct drm_crtc *crtc); -extern bool drm_helper_encoder_in_use(struct drm_encoder *encoder); +void drm_helper_disable_unused_functions(struct drm_device *dev); +int drm_crtc_helper_set_config(struct drm_mode_set *set, + struct drm_modeset_acquire_ctx *ctx); +bool drm_crtc_helper_set_mode(struct drm_crtc *crtc, + struct drm_display_mode *mode, + int x, int y, + struct drm_framebuffer *old_fb); +bool drm_helper_crtc_in_use(struct drm_crtc *crtc); +bool drm_helper_encoder_in_use(struct drm_encoder *encoder); -extern int drm_helper_connector_dpms(struct drm_connector *connector, int mode); +int drm_helper_connector_dpms(struct drm_connector *connector, int mode); -extern void drm_helper_resume_force_mode(struct drm_device *dev); +void drm_helper_resume_force_mode(struct drm_device *dev); int drm_helper_crtc_mode_set(struct drm_crtc *crtc, struct drm_display_mode *mode, struct drm_display_mode *adjusted_mode, int x, int y, @@ -63,15 +64,18 @@ int drm_helper_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y, struct drm_framebuffer *old_fb); /* drm_probe_helper.c */ -extern int drm_helper_probe_single_connector_modes(struct drm_connector - *connector, uint32_t maxX, - uint32_t maxY); -extern void drm_kms_helper_poll_init(struct drm_device *dev); -extern void drm_kms_helper_poll_fini(struct drm_device *dev); -extern bool drm_helper_hpd_irq_event(struct drm_device *dev); -extern void drm_kms_helper_hotplug_event(struct drm_device *dev); +int drm_helper_probe_single_connector_modes(struct drm_connector + *connector, uint32_t maxX, + uint32_t maxY); +int drm_helper_probe_detect(struct drm_connector *connector, + struct drm_modeset_acquire_ctx *ctx, + bool force); +void drm_kms_helper_poll_init(struct drm_device *dev); +void drm_kms_helper_poll_fini(struct drm_device *dev); +bool drm_helper_hpd_irq_event(struct drm_device *dev); +void drm_kms_helper_hotplug_event(struct drm_device *dev); -extern void drm_kms_helper_poll_disable(struct drm_device *dev); -extern void drm_kms_helper_poll_enable(struct drm_device *dev); +void drm_kms_helper_poll_disable(struct drm_device *dev); +void drm_kms_helper_poll_enable(struct drm_device *dev); #endif |