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

Commit b064be07 authored by Kumar, Mahesh's avatar Kumar, Mahesh Committed by Maarten Lankhorst
Browse files

drm/i915/skl+: unify cpp value in WM calculation 



use same cpp value in different phase of plane WM caluclation.

Signed-off-by: default avatarMahesh Kumar <mahesh1.kumar@intel.com>
Reviewed-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170705143154.32132-7-mahesh1.kumar@intel.com
parent 129eaa95

drivers/gpu/drm/i915/intel_pm.c

+2 −4
Original line number Diff line number Diff line
@@ -4399,13 +4399,11 @@ static int skl_compute_plane_wm(const struct drm_i915_private *dev_priv, 
		width = drm_rect_width(&intel_pstate->base.src) >> 16;

	}



	cpp = fb->format->cpp[0];

	cpp = (fb->format->format == DRM_FORMAT_NV12) ? fb->format->cpp[1] :

							fb->format->cpp[0];

	plane_pixel_rate = skl_adjusted_plane_pixel_rate(cstate, intel_pstate);



	if (drm_rotation_90_or_270(pstate->rotation)) {

		int cpp = (fb->format->format == DRM_FORMAT_NV12) ?

			fb->format->cpp[1] :

			fb->format->cpp[0];



		switch (cpp) {

		case 1: