diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-02-22 06:24:20 -0500 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-02-23 19:58:15 -0500 |
commit | c982bd90f58681d00363538167477e60e2c8f731 (patch) | |
tree | 6d3cac32ad69bbdcba76535daa52fd4d1d4114b6 /include/drm/drm_crtc_helper.h | |
parent | 1af434a92871af93d97ce28e35497532a4167a0c (diff) |
drm/atomic-helpers: make mode_set hooks optional
With runtime PM the hw might still be off while doing the ->mode_set
callbacks - runtime PM get/put should only happen in the
enable/disable hooks to properly support DPMS. Which essentially makes
these callbacks useless for drivers support runtime PM, so make them
optional. Again motivated by discussions with Laurent.
Cc: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'include/drm/drm_crtc_helper.h')
-rw-r--r-- | include/drm/drm_crtc_helper.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h index c250a22b39ab..92d5135b55d2 100644 --- a/include/drm/drm_crtc_helper.h +++ b/include/drm/drm_crtc_helper.h | |||
@@ -89,6 +89,7 @@ struct drm_crtc_helper_funcs { | |||
89 | int (*mode_set)(struct drm_crtc *crtc, struct drm_display_mode *mode, | 89 | int (*mode_set)(struct drm_crtc *crtc, struct drm_display_mode *mode, |
90 | struct drm_display_mode *adjusted_mode, int x, int y, | 90 | struct drm_display_mode *adjusted_mode, int x, int y, |
91 | struct drm_framebuffer *old_fb); | 91 | struct drm_framebuffer *old_fb); |
92 | /* Actually set the mode for atomic helpers, optional */ | ||
92 | void (*mode_set_nofb)(struct drm_crtc *crtc); | 93 | void (*mode_set_nofb)(struct drm_crtc *crtc); |
93 | 94 | ||
94 | /* Move the crtc on the current fb to the given position *optional* */ | 95 | /* Move the crtc on the current fb to the given position *optional* */ |
@@ -119,7 +120,7 @@ struct drm_crtc_helper_funcs { | |||
119 | * @mode_fixup: try to fixup proposed mode for this connector | 120 | * @mode_fixup: try to fixup proposed mode for this connector |
120 | * @prepare: part of the disable sequence, called before the CRTC modeset | 121 | * @prepare: part of the disable sequence, called before the CRTC modeset |
121 | * @commit: called after the CRTC modeset | 122 | * @commit: called after the CRTC modeset |
122 | * @mode_set: set this mode | 123 | * @mode_set: set this mode, optional for atomic helpers |
123 | * @get_crtc: return CRTC that the encoder is currently attached to | 124 | * @get_crtc: return CRTC that the encoder is currently attached to |
124 | * @detect: connection status detection | 125 | * @detect: connection status detection |
125 | * @disable: disable encoder when not in use (overrides DPMS off) | 126 | * @disable: disable encoder when not in use (overrides DPMS off) |