[Intel-gfx] [PATCH] fixup! drm/i915/skl: Eliminate usage of pipe_wm_parameters from SKL-style WM (v3)

[Zanoni, Paulo R]

Em Qui, 2015-10-01 às 16:03 -0700, Matt Roper escreveu:
> Cc: Paulo Zanoni <paulo.r.zanoni at intel.com>
> Signed-off-by: Matt Roper <matthew.d.roper at intel.com>
> ---
> Paulo, I'm not positive that this is the cause of the issues you're
> seeing, but
> I did find this unwanted behavior change while re-reading all the SKL
> watermark
> code.  Could you give this a try and see if it improves your
> situation at all?

Thanks for the patch, but unfortunately this doesn't solve the problems
I'm seeing.

For my normal work activities I'm carrying a patch that reverts the
following commits:

drm/i915: Calculate watermark configuration during atomic check (v2)
drm/i915: Don't set plane visible during HW readout if CRTC is off
drm/i915: Calculate ILK-style watermarks during atomic check (v3)
drm/i915: Calculate pipe watermarks into CRTC state (v3)
drm/i915: Refactor ilk_update_wm (v3)
drm/i915: Drop intel_update_sprite_watermarks

So I guess the sprite update thing is very likely the first bad commit.
I'm also noticing that the screen stays black for _way_ too much time
during boot, but I'm not sure it's caused by the watermark series:
might be something else on -nightly.

Thanks,
Paulo

> 
>  drivers/gpu/drm/i915/intel_pm.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/drivers/gpu/drm/i915/intel_pm.c
> b/drivers/gpu/drm/i915/intel_pm.c
> index 3857592..22c97f2 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -2951,6 +2951,9 @@ skl_get_total_relative_data_rate(const struct
> intel_crtc_state *cstate)
>  		if (pstate->fb == NULL)
>  			continue;
>  
> +		if (intel_plane->base.type == DRM_PLANE_TYPE_CURSOR)
> +			continue;
> +
>  		/* packed/uv */
>  		total_data_rate +=
> skl_plane_relative_data_rate(cstate,
>  								psta
> te,