Commit d5ef86b3 authored by Maarten Lankhorst's avatar Maarten Lankhorst
Browse files

drm/i915: Add pci ids and uapi for DG1 



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: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
References: https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11584
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Jason Ekstrand <jason@jlekstrand.net>
Link: https://patchwork.freedesktop.org/patch/msgid/20210812124452.622233-2-maarten.lankhorst@linux.intel.com


Acked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: default avatarJason Ekstrand <jason@jlekstrand.net>
parent ad482232

drivers/gpu/drm/i915/gem/i915_gem_create.c

+0 −3
Original line number Diff line number Diff line
@@ -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;

drivers/gpu/drm/i915/i915_pci.c

+1 −0
Original line number Diff line number Diff line
@@ -1096,6 +1096,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);

drivers/gpu/drm/i915/i915_query.c

+0 −3
Original line number Diff line number Diff line
@@ -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;