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

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

drm/i915: Use intel_wm_plane_visible() on VLV/CHV as well 



VLV/CHV don't have double buffered watermarks so they need to consider
the cursor visibility as a special case just like ILK-BDW. Let's use
the helper we have for that.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170303151928.23053-4-ville.syrjala@linux.intel.com


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

drivers/gpu/drm/i915/intel_pm.c

+2 −2
Original line number Diff line number Diff line
@@ -1029,7 +1029,7 @@ static uint16_t vlv_compute_wm_level(const struct intel_crtc_state *crtc_state, 
	if (dev_priv->wm.pri_latency[level] == 0)

		return USHRT_MAX;



	if (!plane_state->base.visible)

	if (!intel_wm_plane_visible(crtc_state, plane_state))

		return 0;



	cpp = plane_state->base.fb->format->cpp[0];
@@ -1203,7 +1203,7 @@ static bool vlv_plane_wm_compute(struct intel_crtc_state *crtc_state, 
	int level;

	bool dirty = false;



	if (!plane_state->base.visible) {

	if (!intel_wm_plane_visible(crtc_state, plane_state)) {

		dirty |= vlv_raw_plane_wm_set(crtc_state, 0, plane_id, 0);

		goto out;

	}