Commit 85d712f0 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-gt-next-2023-05-24' of... 

Merge tag 'drm-intel-gt-next-2023-05-24' of git://anongit.freedesktop.org/drm/drm-intel

 into drm-next

UAPI Changes:

- New getparam for querying PXP support and load status

Cross-subsystem Changes:

- GSC/MEI proxy driver

Driver Changes:

Fixes/improvements/new stuff:

- Avoid clearing pre-allocated framebuffers with the TTM backend (Nirmoy Das)
- Implement framebuffer mmap support (Nirmoy Das)
- Disable sampler indirect state in bindless heap (Lionel Landwerlin)
- Avoid out-of-bounds access when loading HuC (Lucas De Marchi)
- Actually return an error if GuC version range check fails (John Harrison)
- Get mutex and rpm ref just once in hwm_power_max_write (Ashutosh Dixit)
- Disable PL1 power limit when loading GuC firmware (Ashutosh Dixit)
- Block in hwmon while waiting for GuC reset to complete (Ashutosh Dixit)
- Provide sysfs for SLPC efficient freq (Vinay Belgaumkar)
- Add support for total context runtime for GuC back-end (Umesh Nerlige Ramappa)
- Enable fdinfo for GuC backends (Umesh Nerlige Ramappa)
- Don't capture Gen8 regs on Xe devices (John Harrison)
- Fix error capture for virtual engines (John Harrison)
- Track patch level versions on reduced version firmware files (John Harrison)
- Decode another GuC load failure case (John Harrison)
- GuC loading and firmware table handling fixes (John Harrison)
- Fix confused register capture list creation (John Harrison)
- Dump error capture to kernel log (John Harrison)
- Dump error capture to dmesg on CTB error (John Harrison)
- Disable rps_boost debugfs when SLPC is used (Vinay Belgaumkar)

Future platform enablement:

- Disable stolen memory backed FB for A0 [mtl] (Nirmoy Das)
- Various refactors for multi-tile enablement (Andi Shyti, Tejas Upadhyay)
- Extend Wa_22011802037 to MTL A-step (Madhumitha Tolakanahalli Pradeep)
- WA to clear RDOP clock gating [mtl] (Haridhar Kalvala)
- Set has_llc=0 [mtl] (Fei Yang)
- Define MOCS and PAT tables for MTL (Madhumitha Tolakanahalli Pradeep)
- Add PTE encode function [mtl] (Fei Yang)
- fix mocs selftest [mtl] (Fei Yang)
- Workaround coherency issue for Media [mtl] (Fei Yang)
- Add workaround 14018778641 [mtl] (Tejas Upadhyay)
- Implement Wa_14019141245 [mtl] (Radhakrishna Sripada)
- Fix the wa number for Wa_22016670082 [mtl] (Radhakrishna Sripada)
- Use correct huge page manager for MTL (Jonathan Cavitt)
- GSC/MEI support for Meteorlake (Alexander Usyskin, Daniele Ceraolo Spurio)
- Define GuC firmware version for MTL (John Harrison)
- Drop FLAT CCS check [mtl] (Pallavi Mishra)
- Add MTL for remapping CCS FBs [mtl] (Clint Taylor)
- Meteorlake PXP enablement (Alan Previn)
- Do not enable render power-gating on MTL (Andrzej Hajda)
- Add MTL performance tuning changes (Radhakrishna Sripada)
- Extend Wa_16014892111 to MTL A-step (Radhakrishna Sripada)
- PMU multi-tile support (Tvrtko Ursulin)
- End support for set caching ioctl [mtl] (Fei Yang)

Driver refactors:

- Use i915 instead of dev_priv insied the file_priv structure (Andi Shyti)
- Use proper parameter naming in for_each_engine() (Andi Shyti)
- Use gt_err for GT info (Tejas Upadhyay)
- Consolidate duplicated capture list code (John Harrison)
- Capture list naming clean up (John Harrison)
- Use kernel-doc -Werror when CONFIG_DRM_I915_WERROR=y (Jani Nikula)
- Preparation for using PAT index (Fei Yang)
- Use pat_index instead of cache_level (Fei Yang)

Miscellaneous:

- Fix memory leaks in i915 selftests (Cong Liu)
- Record GT error for gt failure (Tejas Upadhyay)
- Migrate platform-dependent mock hugepage selftests to live (Jonathan Cavitt)
- Update the SLPC selftest (Vinay Belgaumkar)
- Throw out set() wrapper (Jani Nikula)
- Large driver kernel doc cleanup (Jani Nikula)
- Fix probe injection CI failures after recent change (John Harrison)
- Make unexpected firmware versions an error in debug builds (John Harrison)
- Silence UBSAN uninitialized bool variable warning (Ashutosh Dixit)
- Fix memory leaks in function live_nop_switch (Cong Liu)

Merges:

- Merge drm/drm-next into drm-intel-gt-next (Joonas Lahtinen)

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

# Conflicts:
#	drivers/gpu/drm/i915/gt/uc/intel_guc_capture.c
From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/ZG5SxCWRSkZhTDtY@tursulin-desk
parents b8887e79 0fbcf570

drivers/gpu/drm/i915/Makefile

+4 −2
Original line number Diff line number Diff line
@@ -194,6 +194,7 @@ i915-y += \ 
# general-purpose microcontroller (GuC) support

i915-y += \

	  gt/uc/intel_gsc_fw.o \

	  gt/uc/intel_gsc_proxy.o \

	  gt/uc/intel_gsc_uc.o \

	  gt/uc/intel_gsc_uc_heci_cmd_submit.o\

	  gt/uc/intel_guc.o \
@@ -338,6 +339,7 @@ i915-y += \ 
i915-$(CONFIG_DRM_I915_PXP) += \

	pxp/intel_pxp_cmd.o \

	pxp/intel_pxp_debugfs.o \

	pxp/intel_pxp_gsccs.o \

	pxp/intel_pxp_irq.o \

	pxp/intel_pxp_pm.o \

	pxp/intel_pxp_session.o
@@ -373,7 +375,7 @@ obj-$(CONFIG_DRM_I915_GVT_KVMGT) += kvmgt.o 
#

# Enable locally for CONFIG_DRM_I915_WERROR=y. See also scripts/Makefile.build

ifdef CONFIG_DRM_I915_WERROR

    cmd_checkdoc = $(srctree)/scripts/kernel-doc -none $<

    cmd_checkdoc = $(srctree)/scripts/kernel-doc -none -Werror $<

endif



# header test
@@ -388,7 +390,7 @@ always-$(CONFIG_DRM_I915_WERROR) += \ 


quiet_cmd_hdrtest = HDRTEST $(patsubst %.hdrtest,%.h,$@)

      cmd_hdrtest = $(CC) $(filter-out $(CFLAGS_GCOV), $(c_flags)) -S -o /dev/null -x c /dev/null -include $<; \

		$(srctree)/scripts/kernel-doc -none $<; touch $@

		$(srctree)/scripts/kernel-doc -none -Werror $<; touch $@



$(obj)/%.hdrtest: $(src)/%.h FORCE

	$(call if_changed_dep,hdrtest)

drivers/gpu/drm/i915/display/intel_dpt.c

+7 −7
Original line number Diff line number Diff line
@@ -43,24 +43,24 @@ static void gen8_set_pte(void __iomem *addr, gen8_pte_t pte) 
static void dpt_insert_page(struct i915_address_space *vm,

			    dma_addr_t addr,

			    u64 offset,

			    enum i915_cache_level level,

			    unsigned int pat_index,

			    u32 flags)

{

	struct i915_dpt *dpt = i915_vm_to_dpt(vm);

	gen8_pte_t __iomem *base = dpt->iomem;



	gen8_set_pte(base + offset / I915_GTT_PAGE_SIZE,

		     vm->pte_encode(addr, level, flags));

		     vm->pte_encode(addr, pat_index, flags));

}



static void dpt_insert_entries(struct i915_address_space *vm,

			       struct i915_vma_resource *vma_res,

			       enum i915_cache_level level,

			       unsigned int pat_index,

			       u32 flags)

{

	struct i915_dpt *dpt = i915_vm_to_dpt(vm);

	gen8_pte_t __iomem *base = dpt->iomem;

	const gen8_pte_t pte_encode = vm->pte_encode(0, level, flags);

	const gen8_pte_t pte_encode = vm->pte_encode(0, pat_index, flags);

	struct sgt_iter sgt_iter;

	dma_addr_t addr;

	int i;
@@ -83,7 +83,7 @@ static void dpt_clear_range(struct i915_address_space *vm, 
static void dpt_bind_vma(struct i915_address_space *vm,

			 struct i915_vm_pt_stash *stash,

			 struct i915_vma_resource *vma_res,

			 enum i915_cache_level cache_level,

			 unsigned int pat_index,

			 u32 flags)

{

	u32 pte_flags;
@@ -98,7 +98,7 @@ static void dpt_bind_vma(struct i915_address_space *vm, 
	if (vma_res->bi.lmem)

		pte_flags |= PTE_LM;



	vm->insert_entries(vm, vma_res, cache_level, pte_flags);

	vm->insert_entries(vm, vma_res, pat_index, pte_flags);



	vma_res->page_sizes_gtt = I915_GTT_PAGE_SIZE;
@@ -300,7 +300,7 @@ intel_dpt_create(struct intel_framebuffer *fb) 
	vm->vma_ops.bind_vma    = dpt_bind_vma;

	vm->vma_ops.unbind_vma  = dpt_unbind_vma;



	vm->pte_encode = gen8_ggtt_pte_encode;

	vm->pte_encode = vm->gt->ggtt->vm.pte_encode;



	dpt->obj = dpt_obj;

	dpt->obj->is_dpt = true;

drivers/gpu/drm/i915/display/intel_fb.c

+6 −3
Original line number Diff line number Diff line
@@ -1190,7 +1190,8 @@ bool intel_fb_needs_pot_stride_remap(const struct intel_framebuffer *fb) 
{

	struct drm_i915_private *i915 = to_i915(fb->base.dev);



	return IS_ALDERLAKE_P(i915) && intel_fb_uses_dpt(&fb->base);

	return (IS_ALDERLAKE_P(i915) || DISPLAY_VER(i915) >= 14) &&

		intel_fb_uses_dpt(&fb->base);

}



static int intel_fb_pitch(const struct intel_framebuffer *fb, int color_plane, unsigned int rotation)
@@ -1326,9 +1327,10 @@ plane_view_scanout_stride(const struct intel_framebuffer *fb, int color_plane, 
			  unsigned int tile_width,

			  unsigned int src_stride_tiles, unsigned int dst_stride_tiles)

{

	struct drm_i915_private *i915 = to_i915(fb->base.dev);

	unsigned int stride_tiles;



	if (IS_ALDERLAKE_P(to_i915(fb->base.dev)))

	if (IS_ALDERLAKE_P(i915) || DISPLAY_VER(i915) >= 14)

		stride_tiles = src_stride_tiles;

	else

		stride_tiles = dst_stride_tiles;
@@ -1522,7 +1524,8 @@ static void intel_fb_view_init(struct drm_i915_private *i915, struct intel_fb_vi 
	memset(view, 0, sizeof(*view));

	view->gtt.type = view_type;



	if (view_type == I915_GTT_VIEW_REMAPPED && IS_ALDERLAKE_P(i915))

	if (view_type == I915_GTT_VIEW_REMAPPED &&

	    (IS_ALDERLAKE_P(i915) || DISPLAY_VER(i915) >= 14))

		view->gtt.remapped.plane_alignment = SZ_2M / PAGE_SIZE;

}

drivers/gpu/drm/i915/display/intel_fbdev.c

+24 −14
Original line number Diff line number Diff line
@@ -40,8 +40,10 @@ 
#include <drm/drm_crtc.h>

#include <drm/drm_fb_helper.h>

#include <drm/drm_fourcc.h>

#include <drm/drm_gem_framebuffer_helper.h>



#include "gem/i915_gem_lmem.h"

#include "gem/i915_gem_mman.h"



#include "i915_drv.h"

#include "intel_display_types.h"
@@ -67,6 +69,11 @@ struct intel_fbdev { 
	struct mutex hpd_lock;

};



static struct intel_fbdev *to_intel_fbdev(struct drm_fb_helper *fb_helper)

{

	return container_of(fb_helper, struct intel_fbdev, helper);

}



static struct intel_frontbuffer *to_frontbuffer(struct intel_fbdev *ifbdev)

{

	return ifbdev->fb->frontbuffer;
@@ -79,9 +86,7 @@ static void intel_fbdev_invalidate(struct intel_fbdev *ifbdev) 


static int intel_fbdev_set_par(struct fb_info *info)

{

	struct drm_fb_helper *fb_helper = info->par;

	struct intel_fbdev *ifbdev =

		container_of(fb_helper, struct intel_fbdev, helper);

	struct intel_fbdev *ifbdev = to_intel_fbdev(info->par);

	int ret;



	ret = drm_fb_helper_set_par(info);
@@ -93,9 +98,7 @@ static int intel_fbdev_set_par(struct fb_info *info) 


static int intel_fbdev_blank(int blank, struct fb_info *info)

{

	struct drm_fb_helper *fb_helper = info->par;

	struct intel_fbdev *ifbdev =

		container_of(fb_helper, struct intel_fbdev, helper);

	struct intel_fbdev *ifbdev = to_intel_fbdev(info->par);

	int ret;



	ret = drm_fb_helper_blank(blank, info);
@@ -108,9 +111,7 @@ static int intel_fbdev_blank(int blank, struct fb_info *info) 
static int intel_fbdev_pan_display(struct fb_var_screeninfo *var,

				   struct fb_info *info)

{

	struct drm_fb_helper *fb_helper = info->par;

	struct intel_fbdev *ifbdev =

		container_of(fb_helper, struct intel_fbdev, helper);

	struct intel_fbdev *ifbdev = to_intel_fbdev(info->par);

	int ret;



	ret = drm_fb_helper_pan_display(var, info);
@@ -120,6 +121,15 @@ static int intel_fbdev_pan_display(struct fb_var_screeninfo *var, 
	return ret;

}



static int intel_fbdev_mmap(struct fb_info *info, struct vm_area_struct *vma)

{

	struct intel_fbdev *fbdev = to_intel_fbdev(info->par);

	struct drm_gem_object *bo = drm_gem_fb_get_obj(&fbdev->fb->base, 0);

	struct drm_i915_gem_object *obj = to_intel_bo(bo);



	return i915_gem_fb_mmap(obj, vma);

}



static const struct fb_ops intelfb_ops = {

	.owner = THIS_MODULE,

	DRM_FB_HELPER_DEFAULT_OPS,
@@ -131,13 +141,13 @@ static const struct fb_ops intelfb_ops = { 
	.fb_imageblit = drm_fb_helper_cfb_imageblit,

	.fb_pan_display = intel_fbdev_pan_display,

	.fb_blank = intel_fbdev_blank,

	.fb_mmap = intel_fbdev_mmap,

};



static int intelfb_alloc(struct drm_fb_helper *helper,

			 struct drm_fb_helper_surface_size *sizes)

{

	struct intel_fbdev *ifbdev =

		container_of(helper, struct intel_fbdev, helper);

	struct intel_fbdev *ifbdev = to_intel_fbdev(helper);

	struct drm_framebuffer *fb;

	struct drm_device *dev = helper->dev;

	struct drm_i915_private *dev_priv = to_i915(dev);
@@ -163,7 +173,8 @@ static int intelfb_alloc(struct drm_fb_helper *helper, 
	obj = ERR_PTR(-ENODEV);

	if (HAS_LMEM(dev_priv)) {

		obj = i915_gem_object_create_lmem(dev_priv, size,

						  I915_BO_ALLOC_CONTIGUOUS);

						  I915_BO_ALLOC_CONTIGUOUS |

						  I915_BO_ALLOC_USER);

	} else {

		/*

		 * If the FB is too big, just don't use it since fbdev is not very
@@ -193,8 +204,7 @@ static int intelfb_alloc(struct drm_fb_helper *helper, 
static int intelfb_create(struct drm_fb_helper *helper,

			  struct drm_fb_helper_surface_size *sizes)

{

	struct intel_fbdev *ifbdev =

		container_of(helper, struct intel_fbdev, helper);

	struct intel_fbdev *ifbdev = to_intel_fbdev(helper);

	struct intel_framebuffer *intel_fb = ifbdev->fb;

	struct drm_device *dev = helper->dev;

	struct drm_i915_private *dev_priv = to_i915(dev);

drivers/gpu/drm/i915/display/intel_plane_initial.c

+3 −1
Original line number Diff line number Diff line
@@ -110,7 +110,9 @@ initial_plane_vma(struct drm_i915_private *i915, 
	    size * 2 > i915->dsm.usable_size)

		return NULL;



	obj = i915_gem_object_create_region_at(mem, phys_base, size, 0);

	obj = i915_gem_object_create_region_at(mem, phys_base, size,

					       I915_BO_ALLOC_USER |

					       I915_BO_PREALLOC);

	if (IS_ERR(obj))

		return NULL;