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

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

drm/i915: Remove duplicated wm setup for vlv and chv 



The code for vlv and chv wm latency/function pointer setup is
identical. Drop one of the copies.

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


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

drivers/gpu/drm/i915/intel_pm.c

+1 −4
Original line number Diff line number Diff line
@@ -7683,10 +7683,7 @@ void intel_init_pm(struct drm_i915_private *dev_priv) 
			DRM_DEBUG_KMS("Failed to read display plane latency. "

				      "Disable CxSR\n");

		}

	} else if (IS_CHERRYVIEW(dev_priv)) {

		vlv_setup_wm_latency(dev_priv);

		dev_priv->display.update_wm = vlv_update_wm;

	} else if (IS_VALLEYVIEW(dev_priv)) {

	} else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) {

		vlv_setup_wm_latency(dev_priv);

		dev_priv->display.update_wm = vlv_update_wm;

	} else if (IS_PINEVIEW(dev_priv)) {