On Fri, 23 Oct 2015, Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> wrote: > On Fri, Oct 23, 2015 at 02:55:38PM +0100, Thomas Daniel wrote: >> A typo resulted in the watermarks for cursor planes not being calculated >> correctly. Fixed the typo. >> >> Cc: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> >> Signed-off-by: Thomas Daniel <thomas.daniel@xxxxxxxxx> >> --- >> drivers/gpu/drm/i915/intel_pm.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c >> index 0fb0459..c01dd2b 100644 >> --- a/drivers/gpu/drm/i915/intel_pm.c >> +++ b/drivers/gpu/drm/i915/intel_pm.c >> @@ -1135,7 +1135,7 @@ static void vlv_compute_wm(struct intel_crtc *crtc) >> case DRM_PLANE_TYPE_CURSOR: >> for (level = 0; level < wm_state->num_levels; level++) >> wm_state->sr[level].cursor = >> - wm_state->sr[level].cursor; >> + wm_state->wm[level].cursor; > > Yeah, the code is clearly wrong, but due to the fact that we initialize > the sr wm to the max (63) initially, this shouldn't have actually caused > any underruns and whatnot. > > The patch is correct in any case. > Reviewed-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> Pushed to drm-intel-next-fixes, thanks for the patch and review. BR, Jani. > >> break; >> case DRM_PLANE_TYPE_PRIMARY: >> for (level = 0; level < wm_state->num_levels; level++) >> -- >> 1.9.1 -- Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx
