Commit 5794d2f7 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-xe-next-fixes-2024-03-04' of... 

Merge tag 'drm-xe-next-fixes-2024-03-04' of ssh://gitlab.freedesktop.org/drm/xe/kernel

 into drm-next

Driver Changes:

- Fix kunit link failure with built-in xe
- Fix one more 32-bit build failure with ARM compiler
- Fix initialization order of topology struct
- Cleanup unused fields in struct xe_vm
- Fix xe_vm leak when handling page fault on a VM not in fault mode
- Drop use of "grouped target" feature in Makefile since that's
  only available in make >= 4.3

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

From: Lucas De Marchi <lucas.demarchi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/kaypobelrl7u7rtnu6hg5czs3vptbhs4rp24vnwuo2ajoxysto@l5u7377hz4es
parents 098ca765 e62d2e00

drivers/gpu/drm/xe/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ config DRM_XE 
	select DRM_BUDDY

	select DRM_EXEC

	select DRM_KMS_HELPER

	select DRM_KUNIT_TEST_HELPERS if DRM_XE_KUNIT_TEST != n

	select DRM_PANEL

	select DRM_SUBALLOC_HELPER

	select DRM_DISPLAY_DP_HELPER

drivers/gpu/drm/xe/Kconfig.debug

+0 −1
Original line number Diff line number Diff line
@@ -76,7 +76,6 @@ config DRM_XE_KUNIT_TEST 
	depends on DRM_XE && KUNIT && DEBUG_FS

	default KUNIT_ALL_TESTS

	select DRM_EXPORT_FOR_TESTS if m

	select DRM_KUNIT_TEST_HELPERS

	help

	  Choose this option to allow the driver to perform selftests under

	  the kunit framework

drivers/gpu/drm/xe/Makefile

+6 −3
Original line number Diff line number Diff line
@@ -42,7 +42,8 @@ generated_oob := $(obj)/generated/xe_wa_oob.c $(obj)/generated/xe_wa_oob.h 
quiet_cmd_wa_oob = GEN     $(notdir $(generated_oob))

      cmd_wa_oob = mkdir -p $(@D); $^ $(generated_oob)



$(generated_oob) &: $(obj)/xe_gen_wa_oob $(srctree)/$(src)/xe_wa_oob.rules

$(obj)/generated/%_wa_oob.c $(obj)/generated/%_wa_oob.h: $(obj)/xe_gen_wa_oob \

		 $(srctree)/$(src)/xe_wa_oob.rules

	$(call cmd,wa_oob)



uses_generated_oob := \
@@ -158,8 +159,10 @@ xe-$(CONFIG_PCI_IOV) += \ 
	xe_lmtt_2l.o \

	xe_lmtt_ml.o



xe-$(CONFIG_DRM_XE_KUNIT_TEST) += \

	tests/xe_kunit_helpers.o

# include helpers for tests even when XE is built-in

ifdef CONFIG_DRM_XE_KUNIT_TEST

xe-y += tests/xe_kunit_helpers.o

endif



# i915 Display compat #defines and #includes

subdir-ccflags-$(CONFIG_DRM_XE_DISPLAY) += \

drivers/gpu/drm/xe/xe_gt.c

+1 −2
Original line number Diff line number Diff line
@@ -314,8 +314,6 @@ int xe_gt_init_early(struct xe_gt *gt) 
	if (err)

		return err;



	xe_gt_topology_init(gt);



	err = xe_force_wake_put(gt_to_fw(gt), XE_FW_GT);

	if (err)

		return err;
@@ -502,6 +500,7 @@ int xe_gt_init_hwconfig(struct xe_gt *gt) 
	if (err)

		goto out;



	xe_gt_topology_init(gt);

	xe_gt_mcr_init(gt);

	xe_pat_init(gt);

drivers/gpu/drm/xe/xe_gt_pagefault.c

+4 −2
Original line number Diff line number Diff line
@@ -146,10 +146,12 @@ static int handle_pagefault(struct xe_gt *gt, struct pagefault *pf) 
	/* ASID to VM */

	mutex_lock(&xe->usm.lock);

	vm = xa_load(&xe->usm.asid_to_vm, pf->asid);

	if (vm)

	if (vm && xe_vm_in_fault_mode(vm))

		xe_vm_get(vm);

	else

		vm = NULL;

	mutex_unlock(&xe->usm.lock);

	if (!vm || !xe_vm_in_fault_mode(vm))

	if (!vm)

		return -EINVAL;



retry_userptr: