Op 14-09-16 om 02:38 schreef Paulo Zanoni:
> During watermarks calculations, this value is used in 3 different
> places. Only one of them was not using a hardcoded 4. Move the code up
> so everybody can benefit from the actual value.
>
> This should only help on situations with Y tiling + 90/270 rotation +
> 1 or 2 bpp or NV12.
>
> Signed-off-by: Paulo Zanoni <paulo.r.zanoni@xxxxxxxxx>
> ---
> drivers/gpu/drm/i915/intel_pm.c | 56 +++++++++++++++++++++++------------------
> 1 file changed, 32 insertions(+), 24 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index fe43044..4d46315 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -3504,7 +3504,8 @@ static uint32_t skl_wm_method1(uint32_t pixel_rate, uint8_t cpp, uint32_t latenc
>
> static uint32_t skl_wm_method2(uint32_t pixel_rate, uint32_t pipe_htotal,
> uint32_t horiz_pixels, uint8_t cpp,
> - uint64_t tiling, uint32_t latency)
> + uint64_t tiling, uint32_t latency,
> + uint32_t y_min_scanlines)
> {
> uint32_t ret;
> uint32_t plane_bytes_per_line, plane_blocks_per_line;
> @@ -3517,9 +3518,9 @@ static uint32_t skl_wm_method2(uint32_t pixel_rate, uint32_t pipe_htotal,
>
> if (tiling == I915_FORMAT_MOD_Y_TILED ||
> tiling == I915_FORMAT_MOD_Yf_TILED) {
> - plane_bytes_per_line *= 4;
> + plane_bytes_per_line *= y_min_scanlines;
> plane_blocks_per_line = DIV_ROUND_UP(plane_bytes_per_line, 512);
> - plane_blocks_per_line /= 4;
> + plane_blocks_per_line /= y_min_scanlines;
> } else if (tiling == DRM_FORMAT_MOD_NONE) {
> plane_blocks_per_line = DIV_ROUND_UP(plane_bytes_per_line, 512) + 1;
> } else {
> @@ -3576,6 +3577,7 @@ static int skl_compute_plane_wm(const struct drm_i915_private *dev_priv,
> uint8_t cpp;
> uint32_t width = 0, height = 0;
> uint32_t plane_pixel_rate;
> + uint32_t y_min_scanlines;
>
> if (latency == 0 || !cstate->base.active || !intel_pstate->base.visible) {
> *enabled = false;
> @@ -3591,38 +3593,44 @@ static int skl_compute_plane_wm(const struct drm_i915_private *dev_priv,
> cpp = drm_format_plane_cpp(fb->pixel_format, 0);
> plane_pixel_rate = skl_adjusted_plane_pixel_rate(cstate, intel_pstate);
>
> + if (intel_rotation_90_or_270(pstate->rotation)) {
> + int cpp = (fb->pixel_format == DRM_FORMAT_NV12) ?
> + drm_format_plane_cpp(fb->pixel_format, 1) :
> + drm_format_plane_cpp(fb->pixel_format, 0);
> +
> + switch (cpp) {
> + case 1:
> + y_min_scanlines = 16;
> + break;
> + case 2:
> + y_min_scanlines = 8;
> + break;
> + default:
> + WARN(1, "Unsupported pixel depth for rotation");
I wanted to comment that MISSING_CASE was appropriate here, but seems ville beat me to it on patch 9. :-)
~Maarten
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
