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

Commit a16af721 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/i915: rip out now unused is_foo tracking from crtc code 



More ugly stuff gone for good! The big special case left now is
lvds (which is indeed really special).

Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent fec32900

drivers/gpu/drm/i915/intel_display.c

+3 −25
Original line number Original line Diff line number Diff line
@@ -4879,8 +4879,8 @@ static int i9xx_crtc_mode_set(struct drm_crtc *crtc, 
	int refclk, num_connectors = 0;

	int refclk, num_connectors = 0;

	intel_clock_t clock, reduced_clock;

	intel_clock_t clock, reduced_clock;

	u32 dspcntr;

	u32 dspcntr;

	bool ok, has_reduced_clock = false, is_sdvo = false;

	bool ok, has_reduced_clock = false;

	bool is_lvds = false, is_tv = false;

	bool is_lvds = false;

	struct intel_encoder *encoder;

	struct intel_encoder *encoder;

	const intel_limit_t *limit;

	const intel_limit_t *limit;

	int ret;

	int ret;
@@ -4890,15 +4890,6 @@ static int i9xx_crtc_mode_set(struct drm_crtc *crtc, 
		case INTEL_OUTPUT_LVDS:

		case INTEL_OUTPUT_LVDS:

			is_lvds = true;

			is_lvds = true;

			break;

			break;

		case INTEL_OUTPUT_SDVO:

		case INTEL_OUTPUT_HDMI:

			is_sdvo = true;

			if (encoder->needs_tv_clock)

				is_tv = true;

			break;

		case INTEL_OUTPUT_TVOUT:

			is_tv = true;

			break;

		}

		}





		num_connectors++;

		num_connectors++;
@@ -5333,7 +5324,6 @@ static int ironlake_get_refclk(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 *encoder;

	struct intel_encoder *encoder;

	struct intel_encoder *edp_encoder = NULL;

	int num_connectors = 0;

	int num_connectors = 0;

	bool is_lvds = false;

	bool is_lvds = false;
@@ -5342,9 +5332,6 @@ static int ironlake_get_refclk(struct drm_crtc *crtc) 
		case INTEL_OUTPUT_LVDS:

		case INTEL_OUTPUT_LVDS:

			is_lvds = true;

			is_lvds = true;

			break;

			break;

		case INTEL_OUTPUT_EDP:

			edp_encoder = encoder;

			break;

		}

		}

		num_connectors++;

		num_connectors++;

	}

	}
@@ -5503,22 +5490,13 @@ static bool ironlake_compute_clocks(struct drm_crtc *crtc, 
	struct intel_encoder *intel_encoder;

	struct intel_encoder *intel_encoder;

	int refclk;

	int refclk;

	const intel_limit_t *limit;

	const intel_limit_t *limit;

	bool ret, is_sdvo = false, is_tv = false, is_lvds = false;

	bool ret, is_lvds = false;





	for_each_encoder_on_crtc(dev, crtc, intel_encoder) {

	for_each_encoder_on_crtc(dev, crtc, intel_encoder) {

		switch (intel_encoder->type) {

		switch (intel_encoder->type) {

		case INTEL_OUTPUT_LVDS:

		case INTEL_OUTPUT_LVDS:

			is_lvds = true;

			is_lvds = true;

			break;

			break;

		case INTEL_OUTPUT_SDVO:

		case INTEL_OUTPUT_HDMI:

			is_sdvo = true;

			if (intel_encoder->needs_tv_clock)

				is_tv = true;

			break;

		case INTEL_OUTPUT_TVOUT:

			is_tv = true;

			break;

		}

		}

	}

	}