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

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

drm/i915: Split up ironlake_check_fdi_lanes 



Again in preparation to move the configuration checks into the
pipe_config computation stage of the modeset sequence.

Reviewed-by: default avatarImre Deak <imre.deak@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 877d48d5

drivers/gpu/drm/i915/intel_display.c

+25 −6
Original line number Diff line number Diff line
@@ -5459,11 +5459,6 @@ static bool ironlake_check_fdi_lanes(struct intel_crtc *intel_crtc) 
			return false;

		}



		if (intel_crtc->config.fdi_lanes > 2)

			WARN_ON(I915_READ(SOUTH_CHICKEN1) & FDI_BC_BIFURCATION_SELECT);

		else

			cpt_enable_fdi_bc_bifurcation(dev);



		return true;

	case PIPE_C:

		if (!pipe_B_crtc->base.enabled || pipe_B_crtc->config.fdi_lanes <= 2) {
@@ -5480,9 +5475,31 @@ static bool ironlake_check_fdi_lanes(struct intel_crtc *intel_crtc) 
			return false;

		}



		return true;

	default:

		BUG();

	}

}



static void ivybridge_update_fdi_bc_bifurcation(struct intel_crtc *intel_crtc)

{

	struct drm_device *dev = intel_crtc->base.dev;

	struct drm_i915_private *dev_priv = dev->dev_private;



	switch (intel_crtc->pipe) {

	case PIPE_A:

		break;

	case PIPE_B:

		if (intel_crtc->config.fdi_lanes > 2)

			WARN_ON(I915_READ(SOUTH_CHICKEN1) & FDI_BC_BIFURCATION_SELECT);

		else

			cpt_enable_fdi_bc_bifurcation(dev);



		return true;

		break;

	case PIPE_C:

		cpt_enable_fdi_bc_bifurcation(dev);



		break;

	default:

		BUG();

	}
@@ -5756,6 +5773,8 @@ static int ironlake_crtc_mode_set(struct drm_crtc *crtc, 
	}



	fdi_config_ok = ironlake_check_fdi_lanes(intel_crtc);

	if (IS_IVYBRIDGE(dev))

		ivybridge_update_fdi_bc_bifurcation(intel_crtc);



	ironlake_set_pipeconf(crtc);