Em Sex, 2016-11-18 às 20:39 +0530, Mahesh Kumar escreveu:
> This patch adds variable to check for X_tiled & y_tiled planes,
> instead
> of always checking against framebuffer-modifiers.
>
> Changes:
> - Created separate patch as per Paulo's comment
> - Added x_tiled variable as well
> Changes since V2:
> - Incorporate Paulo's comments
> - Rebase
>
> Signed-off-by: Mahesh Kumar <mahesh1.ku...@intel.com>
> ---
> drivers/gpu/drm/i915/intel_pm.c | 22 ++++++++++++----------
> 1 file changed, 12 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_pm.c
> b/drivers/gpu/drm/i915/intel_pm.c
> index e54708d..8908736 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -3592,13 +3592,18 @@ static int skl_compute_plane_wm(const struct
> drm_i915_private *dev_priv,
> struct intel_atomic_state *state =
> to_intel_atomic_state(cstate->base.state);
> bool apply_memory_bw_wa = skl_needs_memory_bw_wa(state);
> + bool y_tiled, x_tiled;
>
> if (latency == 0 || !cstate->base.active || !intel_pstate-
> >base.visible) {
> *enabled = false;
> return 0;
> }
>
> - if (apply_memory_bw_wa && fb->modifier ==
> I915_FORMAT_MOD_X_TILED)
> + y_tiled = fb->modifier == I915_FORMAT_MOD_Y_TILED ||
> + fb->modifier ==
> I915_FORMAT_MOD_Yf_TILED;
Unusual indentation here. I can fix this while applying the patch.
Reviewed-by: Paulo Zanoni <paulo.r.zan...@intel.com>
> + x_tiled = fb->modifier == I915_FORMAT_MOD_X_TILED;
> +
> + if (apply_memory_bw_wa && x_tiled)
> latency += 15;
>
> width = drm_rect_width(&intel_pstate->base.src) >> 16;
> @@ -3637,16 +3642,15 @@ static int skl_compute_plane_wm(const struct
> drm_i915_private *dev_priv,
> y_min_scanlines *= 2;
>
> plane_bytes_per_line = width * cpp;
> - if (fb->modifier == I915_FORMAT_MOD_Y_TILED ||
> - fb->modifier == I915_FORMAT_MOD_Yf_TILED) {
> + if (y_tiled) {
> plane_blocks_per_line =
> DIV_ROUND_UP(plane_bytes_per_line *
> y_min_scanlines, 512);
> plane_blocks_per_line /= y_min_scanlines;
> - } else if (fb->modifier == DRM_FORMAT_MOD_NONE) {
> + } else if (x_tiled) {
> + plane_blocks_per_line =
> DIV_ROUND_UP(plane_bytes_per_line, 512);
> + } else {
> plane_blocks_per_line =
> DIV_ROUND_UP(plane_bytes_per_line, 512)
> + 1;
> - } else {
> - plane_blocks_per_line =
> DIV_ROUND_UP(plane_bytes_per_line, 512);
> }
>
> method1 = skl_wm_method1(plane_pixel_rate, cpp, latency);
> @@ -3657,8 +3661,7 @@ static int skl_compute_plane_wm(const struct
> drm_i915_private *dev_priv,
>
> y_tile_minimum = plane_blocks_per_line * y_min_scanlines;
>
> - if (fb->modifier == I915_FORMAT_MOD_Y_TILED ||
> - fb->modifier == I915_FORMAT_MOD_Yf_TILED) {
> + if (y_tiled) {
> selected_result = max(method2, y_tile_minimum);
> } else {
> if ((cpp * cstate->base.adjusted_mode.crtc_htotal /
> 512 < 1) &&
> @@ -3674,8 +3677,7 @@ static int skl_compute_plane_wm(const struct
> drm_i915_private *dev_priv,
> res_lines = DIV_ROUND_UP(selected_result,
> plane_blocks_per_line);
>
> if (level >= 1 && level <= 7) {
> - if (fb->modifier == I915_FORMAT_MOD_Y_TILED ||
> - fb->modifier == I915_FORMAT_MOD_Yf_TILED) {
> + if (y_tiled) {
> res_blocks += y_tile_minimum;
> res_lines += y_min_scanlines;
> } else {
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
