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

Commit 1d850362 authored by Jesse Barnes's avatar Jesse Barnes Committed by Chris Wilson
Browse files

drm/i915: remove broken intel_pch_has_edp function 



Since we set the output type of PCH attached eDP panels to
INTEL_OUTPUT_eDP this function would never return true when it should.
It's been replaced by working functions.

Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent 814948ad

drivers/gpu/drm/i915/intel_display.c

+2 −3
Original line number Diff line number Diff line
@@ -2001,8 +2001,7 @@ static void ironlake_crtc_enable(struct drm_crtc *crtc) 


	/* Enable panel fitting for LVDS */

	if (dev_priv->pch_pf_size &&

	    (intel_pipe_has_type(crtc, INTEL_OUTPUT_LVDS)

	     || HAS_eDP || intel_pch_has_edp(crtc))) {

	    (intel_pipe_has_type(crtc, INTEL_OUTPUT_LVDS) || HAS_eDP)) {

		/* Force use of hard-coded filter coefficients

		 * as some pre-programmed values are broken,

		 * e.g. x201.
@@ -3717,7 +3716,7 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc, 
				temp |= PIPE_8BPC;

			else

				temp |= PIPE_6BPC;

		} else if (has_edp_encoder || (is_dp && intel_pch_has_edp(crtc))) {

		} else if (has_edp_encoder) {

			switch (dev_priv->edp.bpp/3) {

			case 8:

				temp |= PIPE_8BPC;

drivers/gpu/drm/i915/intel_dp.c

+0 −19
Original line number Diff line number Diff line
@@ -648,25 +648,6 @@ intel_dp_compute_m_n(int bpp, 
	intel_reduce_ratio(&m_n->link_m, &m_n->link_n);

}



bool intel_pch_has_edp(struct drm_crtc *crtc)

{

	struct drm_device *dev = crtc->dev;

	struct drm_mode_config *mode_config = &dev->mode_config;

	struct drm_encoder *encoder;



	list_for_each_entry(encoder, &mode_config->encoder_list, head) {

		struct intel_dp *intel_dp;



		if (encoder->crtc != crtc)

			continue;



		intel_dp = enc_to_intel_dp(encoder);

		if (intel_dp->base.type == INTEL_OUTPUT_DISPLAYPORT)

			return intel_dp->is_pch_edp;

	}

	return false;

}



void

intel_dp_set_m_n(struct drm_crtc *crtc, struct drm_display_mode *mode,

		 struct drm_display_mode *adjusted_mode)

drivers/gpu/drm/i915/intel_drv.h

+0 −1
Original line number Diff line number Diff line
@@ -209,7 +209,6 @@ extern void intel_dp_init(struct drm_device *dev, int dp_reg); 
void

intel_dp_set_m_n(struct drm_crtc *crtc, struct drm_display_mode *mode,

		 struct drm_display_mode *adjusted_mode);

extern bool intel_pch_has_edp(struct drm_crtc *crtc);

extern bool intel_dpd_is_edp(struct drm_device *dev);

extern void intel_edp_link_config (struct intel_encoder *, int *, int *);

extern bool intel_encoder_is_pch_edp(struct drm_encoder *encoder);