diff options
author | Damien Lespiau <damien.lespiau@intel.com> | 2013-08-08 17:28:57 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-08-09 04:46:03 -0400 |
commit | 9237329d83b04cfc7d9fc4608e9db84f32280dc4 (patch) | |
tree | 3c4b68324b180ce6955072258c31e4e98e369195 | |
parent | a658b5d20de78435a971f26d56a765fb40f88e16 (diff) |
drm/i915: Make intel_encoder_dpms() static
And also fix a small typo in the intel_encoder_dpms() comment.
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 4 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/intel_drv.h | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 4127ad2890f3..1f9766a4238e 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c | |||
@@ -3889,10 +3889,10 @@ void intel_encoder_destroy(struct drm_encoder *encoder) | |||
3889 | kfree(intel_encoder); | 3889 | kfree(intel_encoder); |
3890 | } | 3890 | } |
3891 | 3891 | ||
3892 | /* Simple dpms helper for encodres with just one connector, no cloning and only | 3892 | /* Simple dpms helper for encoders with just one connector, no cloning and only |
3893 | * one kind of off state. It clamps all !ON modes to fully OFF and changes the | 3893 | * one kind of off state. It clamps all !ON modes to fully OFF and changes the |
3894 | * state of the entire output pipe. */ | 3894 | * state of the entire output pipe. */ |
3895 | void intel_encoder_dpms(struct intel_encoder *encoder, int mode) | 3895 | static void intel_encoder_dpms(struct intel_encoder *encoder, int mode) |
3896 | { | 3896 | { |
3897 | if (mode == DRM_MODE_DPMS_ON) { | 3897 | if (mode == DRM_MODE_DPMS_ON) { |
3898 | encoder->connectors_active = true; | 3898 | encoder->connectors_active = true; |
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index d516c63fc94d..09c919658735 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h | |||
@@ -583,7 +583,6 @@ extern void intel_crtc_restore_mode(struct drm_crtc *crtc); | |||
583 | extern void intel_crtc_load_lut(struct drm_crtc *crtc); | 583 | extern void intel_crtc_load_lut(struct drm_crtc *crtc); |
584 | extern void intel_crtc_update_dpms(struct drm_crtc *crtc); | 584 | extern void intel_crtc_update_dpms(struct drm_crtc *crtc); |
585 | extern void intel_encoder_destroy(struct drm_encoder *encoder); | 585 | extern void intel_encoder_destroy(struct drm_encoder *encoder); |
586 | extern void intel_encoder_dpms(struct intel_encoder *encoder, int mode); | ||
587 | extern void intel_connector_dpms(struct drm_connector *, int mode); | 586 | extern void intel_connector_dpms(struct drm_connector *, int mode); |
588 | extern bool intel_connector_get_hw_state(struct intel_connector *connector); | 587 | extern bool intel_connector_get_hw_state(struct intel_connector *connector); |
589 | extern void intel_modeset_check_state(struct drm_device *dev); | 588 | extern void intel_modeset_check_state(struct drm_device *dev); |