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

Commit 1a426d61 authored by Maarten Lankhorst's avatar Maarten Lankhorst
Browse files

drm/i915: Handle invalid ilk pipe watermarks correctly. 



This function returns an int, but when ilk_validate_pipe_wm fails it
returns false, which is 0 (success). As a result invalid watermarks
are applied, while they should have been rejected.

Fix this by returning -EINVAL.

Fixes: ed4a6a7c ("drm/i915: Add two-stage ILK-style watermark programming (v11)")
Cc: Matt Roper <matthew.d.roper@intel.com>
Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1456918563-28696-1-git-send-email-maarten.lankhorst@linux.intel.com


Reviewed-by: default avatarMatt Roper <matthew.d.roper@intel.com>
parent 933bfb44

drivers/gpu/drm/i915/intel_pm.c

+1 −1
Original line number Diff line number Diff line
@@ -2345,7 +2345,7 @@ static int ilk_compute_pipe_wm(struct intel_crtc *intel_crtc, 
		pipe_wm->linetime = hsw_compute_linetime_wm(dev, cstate);



	if (!ilk_validate_pipe_wm(dev, pipe_wm))

		return false;

		return -EINVAL;



	ilk_compute_wm_reg_maximums(dev, 1, &max);