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

Commit dc730512 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter
Browse files

drm/i915: intel_limits_vlv_dac and intel_limits_vlv_hdmi are the same 



After aligning the p1 divider limits, and removing the unused p and m
limits, intel_limits_vlv_dac and intel_limits_vlv_hdmi are identical.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarMika Kuoppala <mika.kuoppala@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 5fdc9c49

drivers/gpu/drm/i915/intel_display.c

+2 −15
Original line number Diff line number Diff line
@@ -309,17 +309,7 @@ static const intel_limit_t intel_limits_ironlake_dual_lvds_100m = { 
		.p2_slow = 7, .p2_fast = 7 },

};



static const intel_limit_t intel_limits_vlv_dac = {

	.dot = { .min = 25000, .max = 270000 },

	.vco = { .min = 4000000, .max = 6000000 },

	.n = { .min = 1, .max = 7 },

	.m1 = { .min = 2, .max = 3 },

	.m2 = { .min = 11, .max = 156 },

	.p1 = { .min = 2, .max = 3 },

	.p2 = { .p2_slow = 2, .p2_fast = 20 }, /* slow=min, fast=max */

};



static const intel_limit_t intel_limits_vlv_hdmi = {

static const intel_limit_t intel_limits_vlv = {

	.dot = { .min = 25000, .max = 270000 },

	.vco = { .min = 4000000, .max = 6000000 },

	.n = { .min = 1, .max = 7 },
@@ -412,10 +402,7 @@ static const intel_limit_t *intel_limit(struct drm_crtc *crtc, int refclk) 
		else

			limit = &intel_limits_pineview_sdvo;

	} else if (IS_VALLEYVIEW(dev)) {

		if (intel_pipe_has_type(crtc, INTEL_OUTPUT_ANALOG))

			limit = &intel_limits_vlv_dac;

		else

			limit = &intel_limits_vlv_hdmi;

		limit = &intel_limits_vlv;

	} else if (!IS_GEN2(dev)) {

		if (intel_pipe_has_type(crtc, INTEL_OUTPUT_LVDS))

			limit = &intel_limits_i9xx_lvds;