On Fri, Jan 17, 2020 at 04:16:28AM -0500, Matt Atwood wrote:
> On Tiger Lake we do not support source keying in the pixel formats P010,
> P012, P016.
> 
> Bspec: 52890
> Cc: Matt Roper <matthew.d.ro...@intel.com>
> Signed-off-by: Matt Atwood <matthew.s.atw...@intel.com>
> ---
>  drivers/gpu/drm/i915/display/intel_sprite.c | 13 +++++++++++++
>  1 file changed, 13 insertions(+)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_sprite.c 
> b/drivers/gpu/drm/i915/display/intel_sprite.c
> index fca77ec1e0dd..67176524e60f 100644
> --- a/drivers/gpu/drm/i915/display/intel_sprite.c
> +++ b/drivers/gpu/drm/i915/display/intel_sprite.c
> @@ -2049,6 +2049,19 @@ static int skl_plane_check_fb(const struct 
> intel_crtc_state *crtc_state,
>       unsigned int rotation = plane_state->hw.rotation;
>       struct drm_format_name_buf format_name;
>  
> +     /* Wa_1606054188;tgl

                        ^ This should be a :

> +      *
> +      * TODO: Add format RGB64i when implemented
> +      *
> +      */
> +     if (IS_GEN(dev_priv, 12) &&
> +         (plane_state->ckey.flags & I915_SET_COLORKEY_SOURCE))
> +             if (fb->format->format & (DRM_FORMAT_P010 | DRM_FORMAT_P012
> +                 | DRM_FORMAT_P016)) {
> +                     DRM_DEBUG_KMS("GEN12 does not support source color key 
> planes in formats P01x\n");
> +                     return -EINVAL;
> +             }
> +

I think this whole WA and check should be added after the check for !fb else we 
might have a risk
of dereferencing a NULL pointer.

With the above fixs

Reviewed-by: Manasi Navare <manasi.d.nav...@intel.com>

Manasi

>       if (!fb)
>               return 0;
>  
> -- 
> 2.21.1
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reply via email to