Commit 009f0a64 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-xe-next-fixes-2024-01-16' of... 

Merge tag 'drm-xe-next-fixes-2024-01-16' of https://gitlab.freedesktop.org/drm/xe/kernel

 into drm-next

Driver Changes:
- Fix for definition of wakeref_t
- Fix for an error code aliasing
- Fix for VM_UNBIND_ALL in the case there are no bound VMAs
- Fixes for a number of __iomem address space mismatches reported by sparse
- Fixes for the assignment of exec_queue priority
- A Fix for skip_guc_pc not taking effect
- Workaround for a build problem on GCC 11
- A couple of fixes for error paths
- Fix a Flat CCS compression metadata copy issue
- Fix a misplace array bounds checking
- Don't have display support depend on EXPERT (as discussed on IRC)

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

From: =?UTF-8?q?Thomas=20Hellstr=C3=B6m?= <thomas.hellstrom@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240116102204.106520-1-thomas.hellstrom@linux.intel.com
parents cacea813 bf3ff145

drivers/gpu/drm/xe/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ config DRM_XE 


config DRM_XE_DISPLAY

	bool "Enable display support"

	depends on DRM_XE && EXPERT && DRM_XE=m

	depends on DRM_XE && DRM_XE=m

	select FB_IOMEM_HELPERS

	select I2C

	select I2C_ALGOBIT

drivers/gpu/drm/xe/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ subdir-ccflags-y += $(call cc-option, -Wunused-const-variable) 
subdir-ccflags-y += $(call cc-option, -Wpacked-not-aligned)

subdir-ccflags-y += $(call cc-option, -Wformat-overflow)

subdir-ccflags-y += $(call cc-option, -Wformat-truncation)

subdir-ccflags-y += $(call cc-option, -Wstringop-overflow)

subdir-ccflags-y += $(call cc-option, -Wstringop-truncation)

# The following turn off the warnings enabled by -Wextra

ifeq ($(findstring 2, $(KBUILD_EXTRA_WARN)),)

drivers/gpu/drm/xe/compat-i915-headers/intel_wakeref.h

+1 −1
Original line number Diff line number Diff line
@@ -5,4 +5,4 @@ 


#include <linux/types.h>



typedef bool intel_wakeref_t;
 
typedef unsigned long intel_wakeref_t;

drivers/gpu/drm/xe/tests/xe_bo.c

+2 −3
Original line number Diff line number Diff line
@@ -125,14 +125,13 @@ static void ccs_test_run_tile(struct xe_device *xe, struct xe_tile *tile, 


	bo = xe_bo_create_user(xe, NULL, NULL, SZ_1M, DRM_XE_GEM_CPU_CACHING_WC,

			       ttm_bo_type_device, bo_flags);



	xe_bo_lock(bo, false);



	if (IS_ERR(bo)) {

		KUNIT_FAIL(test, "Failed to create bo.\n");

		return;

	}



	xe_bo_lock(bo, false);



	kunit_info(test, "Verifying that CCS data is cleared on creation.\n");

	ret = ccs_test_migrate(tile, bo, false, 0ULL, 0xdeadbeefdeadbeefULL,

			       test);

drivers/gpu/drm/xe/tests/xe_migrate.c

+1 −1
Original line number Diff line number Diff line
@@ -331,7 +331,7 @@ static void xe_migrate_sanity_test(struct xe_migrate *m, struct kunit *test) 
		xe_res_first_sg(xe_bo_sg(pt), 0, pt->size, &src_it);



	emit_pte(m, bb, NUM_KERNEL_PDE - 1, xe_bo_is_vram(pt), false,

		 &src_it, XE_PAGE_SIZE, pt);

		 &src_it, XE_PAGE_SIZE, pt->ttm.resource);



	run_sanity_job(m, xe, bb, bb->len, "Writing PTE for our fake PT", test);