diff options
author | Zhenyu Wang <zhenyuw@linux.intel.com> | 2010-03-30 02:39:30 -0400 |
---|---|---|
committer | Eric Anholt <eric@anholt.net> | 2010-04-09 17:16:38 -0400 |
commit | c1c43977e6fc789cbde094303fa9ace629a35aca (patch) | |
tree | e557ffa799acfea2d01d1cfd0bf74d35b3c5868c /drivers/gpu/drm/i915/intel_drv.h | |
parent | f1c79df3aa2eda4756ddfe976f2eb5aa6507a35a (diff) |
drm/i915: passing drm connector param for load detection
In load detection, connector's encoder assignment must be kept
consistent for proper mode setting, and this makes connector as
explicit parameter for load detect function to not require single
data structure to hold both encoder and connector reference, ease
the transition for splitted encoder/connector model.
Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_drv.h')
-rw-r--r-- | drivers/gpu/drm/i915/intel_drv.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 5b2e3b219801..4741713df74a 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h | |||
@@ -199,9 +199,11 @@ int intel_get_pipe_from_crtc_id(struct drm_device *dev, void *data, | |||
199 | extern void intel_wait_for_vblank(struct drm_device *dev); | 199 | extern void intel_wait_for_vblank(struct drm_device *dev); |
200 | extern struct drm_crtc *intel_get_crtc_from_pipe(struct drm_device *dev, int pipe); | 200 | extern struct drm_crtc *intel_get_crtc_from_pipe(struct drm_device *dev, int pipe); |
201 | extern struct drm_crtc *intel_get_load_detect_pipe(struct intel_encoder *intel_encoder, | 201 | extern struct drm_crtc *intel_get_load_detect_pipe(struct intel_encoder *intel_encoder, |
202 | struct drm_connector *connector, | ||
202 | struct drm_display_mode *mode, | 203 | struct drm_display_mode *mode, |
203 | int *dpms_mode); | 204 | int *dpms_mode); |
204 | extern void intel_release_load_detect_pipe(struct intel_encoder *intel_encoder, | 205 | extern void intel_release_load_detect_pipe(struct intel_encoder *intel_encoder, |
206 | struct drm_connector *connector, | ||
205 | int dpms_mode); | 207 | int dpms_mode); |
206 | 208 | ||
207 | extern struct drm_connector* intel_sdvo_find(struct drm_device *dev, int sdvoB); | 209 | extern struct drm_connector* intel_sdvo_find(struct drm_device *dev, int sdvoB); |