On Fri, Feb 01, 2019 at 09:38:57PM +0000, Strasser, Kevin wrote:
> Ville Syrjälä wrote:
> > > @@ -1774,6 +1776,45 @@ static const u32 skl_planar_formats[] = {
> > > DRM_FORMAT_NV12,
> > > };
> > >
> > > +static const uint32_t icl_hdr_plane_formats[] = {
> >
> > Please switch to u32 & co. We recently had a mass conversion in the
> > driver.
>
> Will do. Looks like the CI caught that too.
>
> > > static const u64 skl_plane_format_modifiers_noccs[] = {
> > > I915_FORMAT_MOD_Yf_TILED,
> > > I915_FORMAT_MOD_Y_TILED,
> > > @@ -1917,6 +1958,10 @@ static bool skl_plane_format_mod_supported(struct
> > > drm_plane *_plane,
> > > return true;
> > > /* fall through */
> > > case DRM_FORMAT_C8:
> > > + case DRM_FORMAT_XBGR16161616F:
> > > + case DRM_FORMAT_ABGR16161616F:
> > > + case DRM_FORMAT_XRGB16161616F:
> > > + case DRM_FORMAT_ARGB16161616F:
> > > if (modifier == DRM_FORMAT_MOD_LINEAR ||
> > > modifier == I915_FORMAT_MOD_X_TILED ||
> > > modifier == I915_FORMAT_MOD_Y_TILED)
> > > @@ -2053,11 +2098,21 @@ skl_universal_plane_create(struct drm_i915_private
> > > *dev_priv,
> > > plane->update_slave = icl_update_slave;
> > >
> > > if (skl_plane_has_planar(dev_priv, pipe, plane_id)) {
> > > - formats = skl_planar_formats;
> > > - num_formats = ARRAY_SIZE(skl_planar_formats);
> > > + if (INTEL_GEN(dev_priv) > 10 && plane_id < PLANE_SPRITE2) {
> >
> > is_hdr_plane() is around now, please use it.
>
> I don't think I can use icl_is_hdr_plane here without some refactoring. It
> requires the plane->base to be initialized through drm_universal_plane_init,
> which depends on formats/num_formats pointers to be already set.
Hmm. We should probably just convert it into
icl_is_hdr_plane(struct drm_i915_private *dev_priv,
enum plane_id plane_id);
--
Ville Syrjälä
Intel
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel
