[Mesa-dev] [PATCH 4/6] intel/isl: Handle HiZ and CCS tiling more directly

[Jason Ekstrand]

On Tue, Sep 6, 2016 at 7:18 AM, Pohjolainen, Topi <
topi.pohjolainen at gmail.com> wrote:

> On Fri, Sep 02, 2016 at 03:50:45PM -0700, Jason Ekstrand wrote:
> > The HiZ and CCS tiling formats are always used for HiZ and CCS surfaces
> > respectively.  There's no reason why we should go through filter_tiling
> and
> > it's much easier to always get HiZ and CCS right if we just handle them
> > directly.
> > ---
> >  src/intel/isl/isl.c      | 18 ++++++++++++++++--
> >  src/intel/isl/isl_gen7.c | 14 --------------
> >  2 files changed, 16 insertions(+), 16 deletions(-)
> >
> > diff --git a/src/intel/isl/isl.c b/src/intel/isl/isl.c
> > index f8f5802..33e83b1 100644
> > --- a/src/intel/isl/isl.c
> > +++ b/src/intel/isl/isl.c
> > @@ -226,6 +226,22 @@ isl_surf_choose_tiling(const struct isl_device *dev,
> >  {
> >     isl_tiling_flags_t tiling_flags = info->tiling_flags;
> >
> > +   /* HiZ surfaces always use the HiZ tiling */
> > +   if (info->usage & ISL_SURF_USAGE_HIZ_BIT) {
>
> Similarly to CCS case below, should we also have:
>
>          assert(isl_format_get_layout(info->format)->txc == ISL_TXC_HIZ);
>

The assert(info->format == ISL_FORMAT_HIZ) is effectively equivalent.  We
use txc for CCS because there are multiple CCS formats.


> Otherwise:
>
> Reviewed-by: Topi Pohjolainen <topi.pohjolainen at intel.com>
>
> > +      assert(info->format == ISL_FORMAT_HIZ);
> > +      assert(tiling_flags == ISL_TILING_HIZ_BIT);
> > +      *tiling = ISL_TILING_HIZ;
> > +      return true;
> > +   }
> > +
> > +   /* CCS surfaces always use the CCS tiling */
> > +   if (info->usage & ISL_SURF_USAGE_CCS_BIT) {
> > +      assert(isl_format_get_layout(info->format)->txc == ISL_TXC_CCS);
> > +      assert(tiling_flags == ISL_TILING_CCS_BIT);
> > +      *tiling = ISL_TILING_CCS;
> > +      return true;
> > +   }
> > +
> >     if (ISL_DEV_GEN(dev) >= 7) {
> >        gen7_filter_tiling(dev, info, &tiling_flags);
> >     } else {
> > @@ -254,8 +270,6 @@ isl_surf_choose_tiling(const struct isl_device *dev,
> >        CHOOSE(ISL_TILING_LINEAR);
> >     }
> >
> > -   CHOOSE(ISL_TILING_CCS);
> > -   CHOOSE(ISL_TILING_HIZ);
> >     CHOOSE(ISL_TILING_Ys);
> >     CHOOSE(ISL_TILING_Yf);
> >     CHOOSE(ISL_TILING_Y0);
> > diff --git a/src/intel/isl/isl_gen7.c b/src/intel/isl/isl_gen7.c
> > index 7b40291..316b51b 100644
> > --- a/src/intel/isl/isl_gen7.c
> > +++ b/src/intel/isl/isl_gen7.c
> > @@ -217,24 +217,10 @@ gen7_filter_tiling(const struct isl_device *dev,
> >        *flags &= ~ISL_TILING_W_BIT;
> >     }
> >
> > -   /* The HiZ format and tiling always go together */
> > -   if (info->format == ISL_FORMAT_HIZ) {
> > -      *flags &= ISL_TILING_HIZ_BIT;
> > -   } else {
> > -      *flags &= ~ISL_TILING_HIZ_BIT;
> > -   }
> > -
> >     /* MCS buffers are always Y-tiled */
> >     if (isl_format_get_layout(info->format)->txc == ISL_TXC_MCS)
> >        *flags &= ISL_TILING_Y0_BIT;
> >
> > -   /* The CCS formats and tiling always go together */
> > -   if (isl_format_get_layout(info->format)->txc == ISL_TXC_CCS) {
> > -      *flags &= ISL_TILING_CCS_BIT;
> > -   } else {
> > -      *flags &= ~ISL_TILING_CCS_BIT;
> > -   }
> > -
> >     if (info->usage & (ISL_SURF_USAGE_DISPLAY_ROTATE_90_BIT |
> >                        ISL_SURF_USAGE_DISPLAY_ROTATE_180_BIT |
> >                        ISL_SURF_USAGE_DISPLAY_ROTATE_270_BIT)) {
> > --
> > 2.5.0.400.gff86faf
> >
> > _______________________________________________
> > mesa-dev mailing list
> > mesa-dev at lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20160906/d4c6af30/attachment.html>