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

Commit 64eae941 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/i915: drop a few really redundant WARNs in hsw mode_set 



- Correct cpu->pch display matching is already check when we detect
  the PCH type at driver load.
- Plane/pipe state is already checked both when a) enabling, b)
  disabling and in c) the modeset state checker. No need to go
  overboard and also check it in in between a) and b).

Cc: Paulo Zanoni <przanoni@gmail.com>
Reviewed-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent c0b03411

drivers/gpu/drm/i915/intel_display.c

+0 −9
Original line number Diff line number Diff line
@@ -5844,18 +5844,9 @@ static int haswell_crtc_mode_set(struct drm_crtc *crtc, 
		num_connectors++;

	}



	/* We are not sure yet this won't happen. */

	WARN(!HAS_PCH_LPT(dev), "Unexpected PCH type %d\n",

	     INTEL_PCH_TYPE(dev));



	WARN(num_connectors != 1, "%d connectors attached to pipe %c\n",

	     num_connectors, pipe_name(pipe));



	WARN_ON(I915_READ(PIPECONF(intel_crtc->config.cpu_transcoder)) &

		(PIPECONF_ENABLE | I965_PIPECONF_ACTIVE));



	WARN_ON(I915_READ(DSPCNTR(plane)) & DISPLAY_PLANE_ENABLE);



	if (!intel_ddi_pll_mode_set(crtc, adjusted_mode->clock))

		return -EINVAL;