Commit 5c34ba27 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Pass cpu_transcoder to assert_pipe_disabled() always 



I missed a few assert_pipe_disabled() cases when changing it to
take enum transcoder instead of enum pipe, making sparse unhappy.
Convert the leftovers.

Reported-by: default avatarkbuild test robot <lkp@intel.com>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200108145616.7349-1-ville.syrjala@linux.intel.com


Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent 7829c92b

drivers/gpu/drm/i915/display/intel_dp.c

+2 −2
Original line number Diff line number Diff line
@@ -3085,7 +3085,7 @@ static void ilk_edp_pll_on(struct intel_dp *intel_dp, 
	struct intel_crtc *crtc = to_intel_crtc(pipe_config->uapi.crtc);

	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);



	assert_pipe_disabled(dev_priv, crtc->pipe);

	assert_pipe_disabled(dev_priv, pipe_config->cpu_transcoder);

	assert_dp_port_disabled(intel_dp);

	assert_edp_pll_disabled(dev_priv);
@@ -3125,7 +3125,7 @@ static void ilk_edp_pll_off(struct intel_dp *intel_dp, 
	struct intel_crtc *crtc = to_intel_crtc(old_crtc_state->uapi.crtc);

	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);



	assert_pipe_disabled(dev_priv, crtc->pipe);

	assert_pipe_disabled(dev_priv, old_crtc_state->cpu_transcoder);

	assert_dp_port_disabled(intel_dp);

	assert_edp_pll_enabled(dev_priv);

drivers/gpu/drm/i915/display/intel_tv.c

+1 −1
Original line number Diff line number Diff line
@@ -1527,7 +1527,7 @@ static void intel_tv_pre_enable(struct intel_encoder *encoder, 
			   ((video_levels->black << TV_BLACK_LEVEL_SHIFT) |

			    (video_levels->blank << TV_BLANK_LEVEL_SHIFT)));



	assert_pipe_disabled(dev_priv, intel_crtc->pipe);

	assert_pipe_disabled(dev_priv, pipe_config->cpu_transcoder);



	/* Filter ctl must be set before TV_WIN_SIZE */

	tv_filter_ctl = TV_AUTO_SCALE;

CRA Git | Maintained and supported by SUSTech CRA and CCSE