| From 41b90a64e68e108407854ee96fae00f3fb36dd69 Mon Sep 17 00:00:00 2001 |
| From: Damien Lespiau <damien.lespiau@intel.com> |
| Date: Thu, 8 Aug 2013 22:28:57 +0100 |
| Subject: 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> |
| (cherry picked from commit 9237329d83b04cfc7d9fc4608e9db84f32280dc4) |
| Signed-off-by: Darren Hart <dvhart@linux.intel.com> |
| --- |
| drivers/gpu/drm/i915/intel_display.c | 4 ++-- |
| 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 a5aee8993283..109a995150f9 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) |
| kfree(intel_encoder); |
| } |
| |
| -/* Simple dpms helper for encodres with just one connector, no cloning and only |
| +/* Simple dpms helper for encoders with just one connector, no cloning and only |
| * one kind of off state. It clamps all !ON modes to fully OFF and changes the |
| * state of the entire output pipe. */ |
| -void intel_encoder_dpms(struct intel_encoder *encoder, int mode) |
| +static void intel_encoder_dpms(struct intel_encoder *encoder, int mode) |
| { |
| if (mode == DRM_MODE_DPMS_ON) { |
| 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); |
| extern void intel_crtc_load_lut(struct drm_crtc *crtc); |
| extern void intel_crtc_update_dpms(struct drm_crtc *crtc); |
| extern void intel_encoder_destroy(struct drm_encoder *encoder); |
| -extern void intel_encoder_dpms(struct intel_encoder *encoder, int mode); |
| extern void intel_connector_dpms(struct drm_connector *, int mode); |
| extern bool intel_connector_get_hw_state(struct intel_connector *connector); |
| extern void intel_modeset_check_state(struct drm_device *dev); |
| -- |
| 1.8.5.rc3 |
| |
