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

drm/i915: Fix > vs >= mismatch in watermark/ddb calculations 



Bspec says we have to reject the watermark if it's >= the ddb
allocation. Fix the code to reject the == case as it should.
For transition watermarks we can just use >=, for the rest
we'll do +1 when calculating the minimum ddb allocation size.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20181221171436.8218-5-ville.syrjala@linux.intel.com


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

drivers/gpu/drm/i915/intel_pm.c

+5 −5
Original line number Diff line number Diff line
@@ -4371,8 +4371,8 @@ skl_allocate_pipe_ddb(struct intel_crtc_state *cstate, 
				continue;



			wm = &cstate->wm.skl.optimal.planes[plane_id];

			blocks += wm->wm[level].plane_res_b;

			blocks += wm->uv_wm[level].plane_res_b;

			blocks += wm->wm[level].plane_res_b + 1;

			blocks += wm->uv_wm[level].plane_res_b + 1;

		}



		if (blocks < alloc_size) {
@@ -4413,7 +4413,7 @@ skl_allocate_pipe_ddb(struct intel_crtc_state *cstate, 
		extra = min_t(u16, alloc_size,

			      DIV64_U64_ROUND_UP(alloc_size * rate,

						 total_data_rate));

		total[plane_id] = wm->wm[level].plane_res_b + extra;

		total[plane_id] = wm->wm[level].plane_res_b + 1 + extra;

		alloc_size -= extra;

		total_data_rate -= rate;
@@ -4424,7 +4424,7 @@ skl_allocate_pipe_ddb(struct intel_crtc_state *cstate, 
		extra = min_t(u16, alloc_size,

			      DIV64_U64_ROUND_UP(alloc_size * rate,

						 total_data_rate));

		uv_total[plane_id] = wm->uv_wm[level].plane_res_b + extra;

		uv_total[plane_id] = wm->uv_wm[level].plane_res_b + 1 + extra;

		alloc_size -= extra;

		total_data_rate -= rate;

	}
@@ -4477,7 +4477,7 @@ skl_allocate_pipe_ddb(struct intel_crtc_state *cstate, 
	 */

	for_each_plane_id_on_crtc(intel_crtc, plane_id) {

		wm = &cstate->wm.skl.optimal.planes[plane_id];

		if (wm->trans_wm.plane_res_b > total[plane_id])

		if (wm->trans_wm.plane_res_b >= total[plane_id])

			memset(&wm->trans_wm, 0, sizeof(wm->trans_wm));

	}