On 2022-01-20 at 16:42:52 +0000, Robert Beckett wrote:
>
>
> On 20/01/2022 16:21, Ramalingam C wrote:
> > Add a new platform flag, needs_compact_pt, to mark the requirement of
> > compact pt layout support for the ppGTT when using 64K GTT pages.
> >
> > With this flag has_64k_pages will only indicate requirement of 64K
> > GTT page sizes or larger for device local memory access.
> >
> > Suggested-by: Matthew Auld <matthew.auld@xxxxxxxxx>
> > Signed-off-by: Ramalingam C <ramalingam.c@xxxxxxxxx>
> > cc: Robert Beckett <bob.beckett@xxxxxxxxxxxxx>
> > ---
> > drivers/gpu/drm/i915/i915_drv.h | 10 +++++++---
> > drivers/gpu/drm/i915/i915_pci.c | 2 ++
> > drivers/gpu/drm/i915/intel_device_info.h | 1 +
> > 3 files changed, 10 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> > index 890f1f6fbc49..23f4713005bb 100644
> > --- a/drivers/gpu/drm/i915/i915_drv.h
> > +++ b/drivers/gpu/drm/i915/i915_drv.h
> > @@ -1512,12 +1512,16 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,
> > /*
> > * Set this flag, when platform requires 64K GTT page sizes or larger for
> > - * device local memory access. Also this flag implies that we require or
> > - * at least support the compact PT layout for the ppGTT when using the 64K
> > - * GTT pages.
> > + * device local memory access.
> > */
> > #define HAS_64K_PAGES(dev_priv) (INTEL_INFO(dev_priv)->has_64k_pages)
> > +/* Set this flag when platform doesn't allow both 64k pages and 4k pages in
> > + * the same PT. this flag means we need to support compact PT layout for the
> > + * ppGTT when using the 64K GTT pages.
> > + */
> > +#define NEEDS_COMPACT_PT(dev_priv) (INTEL_INFO(dev_priv)->needs_compact_pt)
> > +
> > #define HAS_IPC(dev_priv) (INTEL_INFO(dev_priv)->display.has_ipc)
> > #define HAS_REGION(i915, i) (INTEL_INFO(i915)->memory_regions & (i))
> > diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
> > index 8261b6455747..3e7555ce6894 100644
> > --- a/drivers/gpu/drm/i915/i915_pci.c
> > +++ b/drivers/gpu/drm/i915/i915_pci.c
> > @@ -1028,6 +1028,7 @@ static const struct intel_device_info xehpsdv_info = {
> > PLATFORM(INTEL_XEHPSDV),
> > .display = { },
> > .has_64k_pages = 1,
> > + .needs_compact_pt = 1,
> > .platform_engine_mask =
> > BIT(RCS0) | BIT(BCS0) |
> > BIT(VECS0) | BIT(VECS1) | BIT(VECS2) | BIT(VECS3) |
> > @@ -1046,6 +1047,7 @@ static const struct intel_device_info dg2_info = {
> > .media.rel = 55,
> > PLATFORM(INTEL_DG2),
> > .has_64k_pages = 1,
> > + .needs_compact_pt = 1,
> > .platform_engine_mask =
> > BIT(RCS0) | BIT(BCS0) |
> > BIT(VECS0) | BIT(VECS1) |
> > diff --git a/drivers/gpu/drm/i915/intel_device_info.h b/drivers/gpu/drm/i915/intel_device_info.h
> > index 3699b1c539ea..8ff676f49471 100644
> > --- a/drivers/gpu/drm/i915/intel_device_info.h
> > +++ b/drivers/gpu/drm/i915/intel_device_info.h
> > @@ -130,6 +130,7 @@ enum intel_ppgtt_type {
> > /* Keep has_* in alphabetical order */ \
> > func(has_64bit_reloc); \
> > func(has_64k_pages); \
> > + func(needs_compact_pt; \
>
> missing `)`
> instead of chucking untested patches on ml, I'll add a fixed version to the
> in review series and include it in v3 after testing
Thanks
Ram
>
> > func(gpu_reset_clobbers_display); \
> > func(has_reset_engine); \
> > func(has_global_mocs); \
> >
