[PATCH 2/2] drm/i915: Add pci ids and uapi for DG1

[Jason Ekstrand]

On Thu, Aug 12, 2021 at 9:49 AM Daniel Vetter <daniel.vetter at ffwll.ch> wrote:
>
> On Thu, Aug 12, 2021 at 2:44 PM Maarten Lankhorst
> <maarten.lankhorst at linux.intel.com> wrote:
> >
> > DG1 has support for local memory, which requires the usage of the
> > lmem placement extension for creating bo's, and memregion queries
> > to obtain the size. Because of this, those parts of the uapi are
> > no longer guarded behind FAKE_LMEM.
> >
> > According to the pull request referenced below, mesa should be mostly
> > ready for DG1. VK_EXT_memory_budget is not hooked up yet, but we
> > should definitely just enable the uapi parts by default.
> >
> > Signed-off-by: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
> > References: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11584
> > Cc: Jordan Justen jordan.l.justen at intel.com
> > Cc: Jason Ekstrand jason at jlekstrand.net
>
> Acked-by: Daniel Vetter <daniel.vetter at ffwll.ch>

Acked-by: Jason Ekstrand <jason at jlekstrand.net>

>
> > ---
> >  drivers/gpu/drm/i915/gem/i915_gem_create.c | 3 ---
> >  drivers/gpu/drm/i915/i915_pci.c            | 1 +
> >  drivers/gpu/drm/i915/i915_query.c          | 3 ---
> >  3 files changed, 1 insertion(+), 6 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_create.c b/drivers/gpu/drm/i915/gem/i915_gem_create.c
> > index 23fee13a3384..1d341b8c47c0 100644
> > --- a/drivers/gpu/drm/i915/gem/i915_gem_create.c
> > +++ b/drivers/gpu/drm/i915/gem/i915_gem_create.c
> > @@ -347,9 +347,6 @@ static int ext_set_placements(struct i915_user_extension __user *base,
> >  {
> >         struct drm_i915_gem_create_ext_memory_regions ext;
> >
> > -       if (!IS_ENABLED(CONFIG_DRM_I915_UNSTABLE_FAKE_LMEM))
> > -               return -ENODEV;
> > -
> >         if (copy_from_user(&ext, base, sizeof(ext)))
> >                 return -EFAULT;
> >
> > diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
> > index 1bbd09ad5287..93ccdc6bbd03 100644
> > --- a/drivers/gpu/drm/i915/i915_pci.c
> > +++ b/drivers/gpu/drm/i915/i915_pci.c
> > @@ -1115,6 +1115,7 @@ static const struct pci_device_id pciidlist[] = {
> >         INTEL_RKL_IDS(&rkl_info),
> >         INTEL_ADLS_IDS(&adl_s_info),
> >         INTEL_ADLP_IDS(&adl_p_info),
> > +       INTEL_DG1_IDS(&dg1_info),
> >         {0, 0, 0}
> >  };
> >  MODULE_DEVICE_TABLE(pci, pciidlist);
> > diff --git a/drivers/gpu/drm/i915/i915_query.c b/drivers/gpu/drm/i915/i915_query.c
> > index e49da36c62fb..5e2b909827f4 100644
> > --- a/drivers/gpu/drm/i915/i915_query.c
> > +++ b/drivers/gpu/drm/i915/i915_query.c
> > @@ -432,9 +432,6 @@ static int query_memregion_info(struct drm_i915_private *i915,
> >         u32 total_length;
> >         int ret, id, i;
> >
> > -       if (!IS_ENABLED(CONFIG_DRM_I915_UNSTABLE_FAKE_LMEM))
> > -               return -ENODEV;
> > -
> >         if (query_item->flags != 0)
> >                 return -EINVAL;
> >
> > --
> > 2.32.0
> >
>
>
> --
> Daniel Vetter
> Software Engineer, Intel Corporation
> http://blog.ffwll.ch