[Mesa-dev] [PATCH 3/3] i965/screen: Allow modifiers on sRGB formats

[Daniel Stone]

On Wed, 29 Aug 2018 at 16:43, Eric Engestrom <eric.engestrom at intel.com> wrote:
> On Tuesday, 2018-08-28 21:44:54 -0500, Jason Ekstrand wrote:
> > On Tue, Aug 28, 2018 at 5:22 PM Jason Ekstrand <jason at jlekstrand.net> wrote:
> > > This effectively reverts a26693493570a9d0f0fba1be617e01ee7bfff4db which
> > > was a misguided attempt at protecting intel_query_dma_buf_modifiers from
> > > invalid formats.  Unfortunately, in some internal EGL cases, we can get
> > > an SRGB format validly in this function.  Rejecting such formats caused
> > > us to not allow CCS in some cases where we should have been allowing it.
> > >
> > > There's some question of whether or not we really should be using SRGB
> > > "fourcc" formats that aren't actually in drm_foucc.h but there's not
> > > much harm in allowing them through here.
> > >
> > > [...]
> > >
> > > @@ -1302,6 +1302,14 @@ intel_query_dma_buf_formats(__DRIscreen *_screen,
> > > int max,
> > >     int num_formats = 0, i;
> > >
> > >     for (i = 0; i < ARRAY_SIZE(intel_image_formats); i++) {
> > > +      /* These two formats are valid DRI formats but do not exist in
> > > +       * drm_fourcc.h in the Linux kernel.  We don't want to accidentally
> > > +       * advertise them through the EGL layer.
> > > +       */
> > > +      if (intel_image_formats[i].fourcc == __DRI_IMAGE_FOURCC_SARGB8888 ||
> > > +          intel_image_formats[i].fourcc == __DRI_IMAGE_FOURCC_SABGR8888)
> > > +         return false;
> > >
> >
> > This should be a continue.  Fixed locally.
>
> With that, the series is
> Reviewed-by: Eric Engestrom <eric.engestrom at intel.com>

... and also:
Reviewed-by: Daniel Stone <daniels at collabora.com>