| From d5c5a4b0855c3859e0d703d602e74910c6a06da6 Mon Sep 17 00:00:00 2001 |
| From: Paulo Zanoni <paulo.r.zanoni@intel.com> |
| Date: Tue, 24 Sep 2013 13:52:54 -0300 |
| Subject: drm/i915: make intel_pipe_has_type static |
| |
| Also move it to the top of the file so we can remove the forward |
| declaration. |
| |
| Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com> |
| Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> |
| (cherry picked from commit e0638cdf2d35a0ad04c3ceb8b61d9be4fde0d45f) |
| Signed-off-by: Darren Hart <dvhart@linux.intel.com> |
| --- |
| drivers/gpu/drm/i915/intel_display.c | 31 +++++++++++++++---------------- |
| drivers/gpu/drm/i915/intel_drv.h | 1 - |
| 2 files changed, 15 insertions(+), 17 deletions(-) |
| |
| diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c |
| index dc1f45a2a04a..9c02b9aa7464 100644 |
| --- a/drivers/gpu/drm/i915/intel_display.c |
| +++ b/drivers/gpu/drm/i915/intel_display.c |
| @@ -41,7 +41,6 @@ |
| #include <drm/drm_crtc_helper.h> |
| #include <linux/dma_remapping.h> |
| |
| -bool intel_pipe_has_type(struct drm_crtc *crtc, int type); |
| static void intel_increase_pllclock(struct drm_crtc *crtc); |
| static void intel_crtc_update_cursor(struct drm_crtc *crtc, bool on); |
| |
| @@ -336,6 +335,21 @@ static const intel_limit_t intel_limits_vlv_hdmi = { |
| .p2_slow = 2, .p2_fast = 20 }, |
| }; |
| |
| +/** |
| + * Returns whether any output on the specified pipe is of the specified type |
| + */ |
| +static bool intel_pipe_has_type(struct drm_crtc *crtc, int type) |
| +{ |
| + struct drm_device *dev = crtc->dev; |
| + struct intel_encoder *encoder; |
| + |
| + for_each_encoder_on_crtc(dev, crtc, encoder) |
| + if (encoder->type == type) |
| + return true; |
| + |
| + return false; |
| +} |
| + |
| static const intel_limit_t *intel_ironlake_limit(struct drm_crtc *crtc, |
| int refclk) |
| { |
| @@ -438,21 +452,6 @@ static void i9xx_clock(int refclk, intel_clock_t *clock) |
| clock->dot = clock->vco / clock->p; |
| } |
| |
| -/** |
| - * Returns whether any output on the specified pipe is of the specified type |
| - */ |
| -bool intel_pipe_has_type(struct drm_crtc *crtc, int type) |
| -{ |
| - struct drm_device *dev = crtc->dev; |
| - struct intel_encoder *encoder; |
| - |
| - for_each_encoder_on_crtc(dev, crtc, encoder) |
| - if (encoder->type == type) |
| - return true; |
| - |
| - return false; |
| -} |
| - |
| #define INTELPllInvalid(s) do { /* DRM_DEBUG(s); */ return false; } while (0) |
| /** |
| * Returns whether the given set of divisors are valid for a given refclk with |
| diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h |
| index 805dc923d2a5..04117f76e52f 100644 |
| --- a/drivers/gpu/drm/i915/intel_drv.h |
| +++ b/drivers/gpu/drm/i915/intel_drv.h |
| @@ -608,7 +608,6 @@ extern void intel_ddi_get_config(struct intel_encoder *encoder, |
| |
| /* intel_display.c */ |
| int intel_pch_rawclk(struct drm_device *dev); |
| -extern bool intel_pipe_has_type(struct drm_crtc *crtc, int type); |
| extern void intel_mark_busy(struct drm_device *dev); |
| extern void intel_mark_fb_busy(struct drm_i915_gem_object *obj, |
| struct intel_ring_buffer *ring); |
| -- |
| 1.8.5.rc3 |
| |