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

Commit 6e2cc096 authored by Ander Conselvan de Oliveira's avatar Ander Conselvan de Oliveira Committed by Daniel Vetter
Browse files

drm/i915: Replace some loop through encoders with intel_pipe_has_type() 



In the ironlake mode set code, there was two instances of a loop through
encoders to find out if one of them has INTEL_OUTPUT_LVDS type. Simplify
the code by deleting some lines and use intel_pipe_has_type() instead.

Signed-off-by: default avatarAnder Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 34367381

drivers/gpu/drm/i915/intel_display.c

+2 −19
Original line number Original line Diff line number Diff line
@@ -7110,18 +7110,11 @@ static bool ironlake_compute_clocks(struct drm_crtc *crtc, 
{

{

	struct drm_device *dev = crtc->dev;

	struct drm_device *dev = crtc->dev;

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct intel_encoder *intel_encoder;

	int refclk;

	int refclk;

	const intel_limit_t *limit;

	const intel_limit_t *limit;

	bool ret, is_lvds = false;

	bool ret, is_lvds = false;





	for_each_encoder_on_crtc(dev, crtc, intel_encoder) {

	is_lvds = intel_pipe_has_type(crtc, INTEL_OUTPUT_LVDS);

		switch (intel_encoder->type) {

		case INTEL_OUTPUT_LVDS:

			is_lvds = true;

			break;

		}

	}





	refclk = ironlake_get_refclk(crtc);

	refclk = ironlake_get_refclk(crtc);
@@ -7261,23 +7254,13 @@ static int ironlake_crtc_mode_set(struct drm_crtc *crtc, 
{

{

	struct drm_device *dev = crtc->dev;

	struct drm_device *dev = crtc->dev;

	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);

	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);

	int num_connectors = 0;

	intel_clock_t clock, reduced_clock;

	intel_clock_t clock, reduced_clock;

	u32 dpll = 0, fp = 0, fp2 = 0;

	u32 dpll = 0, fp = 0, fp2 = 0;

	bool ok, has_reduced_clock = false;

	bool ok, has_reduced_clock = false;

	bool is_lvds = false;

	bool is_lvds = false;

	struct intel_encoder *encoder;

	struct intel_shared_dpll *pll;

	struct intel_shared_dpll *pll;





	for_each_encoder_on_crtc(dev, crtc, encoder) {

	is_lvds = intel_pipe_has_type(crtc, INTEL_OUTPUT_LVDS);

		switch (encoder->type) {

		case INTEL_OUTPUT_LVDS:

			is_lvds = true;

			break;

		}



		num_connectors++;

	}





	WARN(!(HAS_PCH_IBX(dev) || HAS_PCH_CPT(dev)),

	WARN(!(HAS_PCH_IBX(dev) || HAS_PCH_CPT(dev)),

	     "Unexpected PCH type %d\n", INTEL_PCH_TYPE(dev));

	     "Unexpected PCH type %d\n", INTEL_PCH_TYPE(dev));