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

Commit 3125d39f authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Drop the nop intel_update_watermarks() call from haswell_crtc_enable() 



HSW+ all use the .initial_watermarks() hook, so there's no point in
calling intel_update_watermarks() from HSW+ specific code. We'll still
hang on to the .initial_watermarks NULL check since theoretically if the
memory latencies are not populated we would not populate the function
pointer either.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1480354637-14209-2-git-send-email-ville.syrjala@linux.intel.com


Reviewed-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
parent 22a2c8e0

drivers/gpu/drm/i915/intel_display.c

+1 −4
Original line number Diff line number Diff line
@@ -5465,10 +5465,7 @@ static void haswell_crtc_enable(struct intel_crtc_state *pipe_config, 
		intel_ddi_enable_transcoder_func(crtc);



	if (dev_priv->display.initial_watermarks != NULL)

		dev_priv->display.initial_watermarks(old_intel_state,

						     pipe_config);

	else

		intel_update_watermarks(intel_crtc);

		dev_priv->display.initial_watermarks(old_intel_state, pipe_config);



	/* XXX: Do the pipe assertions at the right place for BXT DSI. */

	if (!transcoder_is_dsi(cpu_transcoder))