Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e0638cdf authored by Paulo Zanoni's avatar Paulo Zanoni Committed by Daniel Vetter
Browse files

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: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 5f1aae65

drivers/gpu/drm/i915/intel_display.c

+15 −16
Original line number Original line Diff line number Diff line
@@ -41,7 +41,6 @@ 
#include <drm/drm_crtc_helper.h>

#include <drm/drm_crtc_helper.h>

#include <linux/dma_remapping.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_increase_pllclock(struct drm_crtc *crtc);

static void intel_crtc_update_cursor(struct drm_crtc *crtc, bool on);

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 },

		.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,

static const intel_limit_t *intel_ironlake_limit(struct drm_crtc *crtc,

						int refclk)

						int refclk)

{

{
@@ -438,21 +452,6 @@ static void i9xx_clock(int refclk, intel_clock_t *clock) 
	clock->dot = clock->vco / clock->p;

	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)

#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

 * Returns whether the given set of divisors are valid for a given refclk with

drivers/gpu/drm/i915/intel_drv.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -608,7 +608,6 @@ extern void intel_ddi_get_config(struct intel_encoder *encoder, 




/* intel_display.c */

/* intel_display.c */

int intel_pch_rawclk(struct drm_device *dev);

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_busy(struct drm_device *dev);

extern void intel_mark_fb_busy(struct drm_i915_gem_object *obj,

extern void intel_mark_fb_busy(struct drm_i915_gem_object *obj,

			       struct intel_ring_buffer *ring);

			       struct intel_ring_buffer *ring);