drm/i915: Fix maxfifo watermark calc on vlv cursor planes
Subsystems (2)
PATCH 1/1 drm/i915: Fix maxfifo watermark calc on vlv cursor planes
A typo resulted in the watermarks for cursor planes not being calculated correctly. Fixed the typo.
--- drivers/gpu/drm/i915/intel_pm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_pm.c +1 -1
@@ -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;break ;case DRM_PLANE_TYPE_PRIMARY :for (level =0 ; level < wm_state->num_levels; level++)
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 14 lines · Thomas Daniel
A typo resulted in the watermarks for cursor planes not being calculated correctly. Fixed the typo.
Cc Ville Syrjälä <[email protected]>Signed-off-by Thomas Daniel <[email protected]>--- drivers/gpu/drm/i915/intel_pm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/i915/intel_pm.c +0
-0
drivers/gpu/drm/i915/intel_pm.c static void vlv_compute_wm(struct intel_crtc *crtc) · line 1138
Quoted 5 lines
drivers/gpu/drm/i915/intel_pm.c +1
-1@@ -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.
Quoted 5 lines
drivers/gpu/drm/i915/intel_pm.c +0
-0break ;case DRM_PLANE_TYPE_PRIMARY :for (level =0 ; level < wm_state->num_levels; level++)Signature · 1 line
1.9.1
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 25 lines · Ville Syrjälä
Quoted 14 lines · Thomas Daniel
A typo resulted in the watermarks for cursor planes not being calculated correctly. Fixed the typo.
Cc Ville Syrjälä <[email protected]>Signed-off-by Thomas Daniel <[email protected]>--- drivers/gpu/drm/i915/intel_pm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/i915/intel_pm.c +0
-0drivers/gpu/drm/i915/intel_pm.c static void vlv_compute_wm(struct intel_crtc *crtc) · line 1138
Quoted 5 lines
drivers/gpu/drm/i915/intel_pm.c +1
-1@@ -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.
Quoted 2 lines
The patch is correct in any case.
Reviewed-by Ville Syrjälä <[email protected]>
Pushed to drm-intel-next-fixes, thanks for the patch and review.
BR,
Jani.
Quoted 6 lines
Quoted 6 lines
drivers/gpu/drm/i915/intel_pm.c +0
-0break ;case DRM_PLANE_TYPE_PRIMARY :for (level =0 ; level < wm_state->num_levels; level++)Signature · 1 line
1.9.1
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx