diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-05-03 05:49:50 -0400 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-05-06 05:28:12 -0400 |
commit | a1520318a51d6c21b1d9229a9c35b4fcb890b175 (patch) | |
tree | 32a0fdf03a9b5984fb09299d105a391e506cba2e | |
parent | e3b95f1eb5b9a7ecc7241a27499ae8754b845926 (diff) |
drm/i915: make intel_cpt_verify_modeset static
Only one caller. Also drop the intel_ prefix as is now customary for
platform specific and static functions.
Reviewed-by: Paulo Zanoni <paulo.r.zanoni@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 c48bb76c055c..d50994a22966 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c | |||
@@ -3229,7 +3229,7 @@ prepare: /* separate function? */ | |||
3229 | return pll; | 3229 | return pll; |
3230 | } | 3230 | } |
3231 | 3231 | ||
3232 | void intel_cpt_verify_modeset(struct drm_device *dev, int pipe) | 3232 | static void cpt_verify_modeset(struct drm_device *dev, int pipe) |
3233 | { | 3233 | { |
3234 | struct drm_i915_private *dev_priv = dev->dev_private; | 3234 | struct drm_i915_private *dev_priv = dev->dev_private; |
3235 | int dslreg = PIPEDSL(pipe); | 3235 | int dslreg = PIPEDSL(pipe); |
@@ -3334,7 +3334,7 @@ static void ironlake_crtc_enable(struct drm_crtc *crtc) | |||
3334 | encoder->enable(encoder); | 3334 | encoder->enable(encoder); |
3335 | 3335 | ||
3336 | if (HAS_PCH_CPT(dev)) | 3336 | if (HAS_PCH_CPT(dev)) |
3337 | intel_cpt_verify_modeset(dev, intel_crtc->pipe); | 3337 | cpt_verify_modeset(dev, intel_crtc->pipe); |
3338 | 3338 | ||
3339 | /* | 3339 | /* |
3340 | * There seems to be a race in PCH platform hw (at least on some | 3340 | * There seems to be a race in PCH platform hw (at least on some |
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 88890a30f356..e3108c0966c3 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h | |||
@@ -718,7 +718,6 @@ extern void assert_pipe(struct drm_i915_private *dev_priv, enum pipe pipe, | |||
718 | extern void intel_init_clock_gating(struct drm_device *dev); | 718 | extern void intel_init_clock_gating(struct drm_device *dev); |
719 | extern void intel_write_eld(struct drm_encoder *encoder, | 719 | extern void intel_write_eld(struct drm_encoder *encoder, |
720 | struct drm_display_mode *mode); | 720 | struct drm_display_mode *mode); |
721 | extern void intel_cpt_verify_modeset(struct drm_device *dev, int pipe); | ||
722 | extern void intel_prepare_ddi(struct drm_device *dev); | 721 | extern void intel_prepare_ddi(struct drm_device *dev); |
723 | extern void hsw_fdi_link_train(struct drm_crtc *crtc); | 722 | extern void hsw_fdi_link_train(struct drm_crtc *crtc); |
724 | extern void intel_ddi_init(struct drm_device *dev, enum port port); | 723 | extern void intel_ddi_init(struct drm_device *dev, enum port port); |