github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-30 01:53:29 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Driver Changes:

Browse Source 
- Fix out-of-bounds access with BIT() (Shuicheng Lin)
  - Fix kunit test checking wrong condition (Matt Roper)
  - Drop duplicate kconfig select (Shuicheng Lin)
  - Fix guc2host irq handler with MSI-X (Venkata Ramana Nayana)
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEE6rM8lpABPHM5FqyDm6KlpjDL6lMFAmkgA6UACgkQm6KlpjDL
 6lNQOQ/7BvIs0E5pAMxlxYq+O5Oyt9roX39ud1ilq2zSrBwxWEQ4n1eWXoveZ1AR
 lTdlhJij1bwEesgHQ59znoLCqIdvqIQpMAAjYnDVcCVDzDFRyrPfL6/PG7tw2gMw
 dyKlF5K2BPCqSL9wPVBNu9mUiPj8PytK8kR/uoJqI7ddBIQjQBt1dOqU+3perp8n
 e6MrfK5cKg9BYQewgky3rkAgt2P/ZIgsQkVoVk58D+OoX3Ot9I4kAfzsRklVwKZS
 2CAqKooqhUrcNRk0u5PCg9NG4N/pmkjYL0MJWKk7MR0YcHhpvUN3AOJ/EtsNrP+6
 oUJAlI3qptJUkGYSwD9WNweNPpISIqIktOhmkKW5SNMKzoAIAUvLbL45GodCeBRw
 FU7zHd9ELcZK9cevI/+0ARwdlBqj+UWArX0PLQ5hT7y3xW6soZeIQlvdsqKABamG
 NEslQsClOoDQrI8U8VxC/QHVvEIoDcFRKb6TbV2N9to0FhhyG8DSg5fct/9lCt9U
 cIl+O/PVq98raUf/DK1pvIzwJxaXQvAh/q1jE9627be9QxytEpdbph5FVMm8QAgT
 ae4OzlbElCGgrnxxCw1JVr0w/+Cj8uud9AV2FNgZC1CGO1uh3HmsFz596YwKFnV8
 AHuyWr6w9pLMSYwOZf4k0Shv12rSLIMb2bXxLnoO7ZRMrDrZpHU=
 =8bu9
 -----END PGP SIGNATURE-----

Merge tag 'drm-xe-fixes-2025-11-21' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-fixes

Driver Changes:
 - Fix out-of-bounds access with BIT() (Shuicheng Lin)
 - Fix kunit test checking wrong condition (Matt Roper)
 - Drop duplicate kconfig select (Shuicheng Lin)
 - Fix guc2host irq handler with MSI-X (Venkata Ramana Nayana)

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

From: Lucas De Marchi <lucas.demarchi@intel.com>
Link: https://patch.msgid.link/uadbrmftcud3wg32c6tje7mmfcr7wgmpnkzxwubk6fletahje2@coek2ciunkvz
This commit is contained in:
Dave Airlie 2025-11-21 18:33:01 +10:00
commit 40b53db87c
4 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/gpu/drm/xe/Kconfig
View File

@ -13,7 +13,6 @@ config DRM_XE
select TMPFS
select DRM_BUDDY
select DRM_CLIENT_SELECTION
select DRM_EXEC
select DRM_KMS_HELPER
select DRM_KUNIT_TEST_HELPERS if DRM_XE_KUNIT_TEST != n
select DRM_PANEL

2
drivers/gpu/drm/xe/tests/xe_mocs.c
View File

@ -49,7 +49,7 @@ static void read_l3cc_table(struct xe_gt *gt,
fw_ref = xe_force_wake_get(gt_to_fw(gt), XE_FORCEWAKE_ALL);
if (!xe_force_wake_ref_has_domain(fw_ref, XE_FORCEWAKE_ALL)) {
xe_force_wake_put(gt_to_fw(gt), fw_ref);
KUNIT_ASSERT_TRUE_MSG(test, true, "Forcewake Failed.\n");
KUNIT_FAIL_AND_ABORT(test, "Forcewake Failed.\n");
}
for (i = 0; i < info->num_mocs_regs; i++) {

18
drivers/gpu/drm/xe/xe_irq.c
View File

@ -847,22 +847,6 @@ static int xe_irq_msix_init(struct xe_device *xe)
return 0;
}
static irqreturn_t guc2host_irq_handler(int irq, void *arg)
{
struct xe_device *xe = arg;
struct xe_tile *tile;
u8 id;
if (!atomic_read(&xe->irq.enabled))
return IRQ_NONE;
for_each_tile(tile, xe, id)
xe_guc_irq_handler(&tile->primary_gt->uc.guc,
GUC_INTR_GUC2HOST);
return IRQ_HANDLED;
}
static irqreturn_t xe_irq_msix_default_hwe_handler(int irq, void *arg)
{
unsigned int tile_id, gt_id;
@ -979,7 +963,7 @@ int xe_irq_msix_request_irqs(struct xe_device *xe)
u16 msix;
msix = GUC2HOST_MSIX;
err = xe_irq_msix_request_irq(xe, guc2host_irq_handler, xe,
err = xe_irq_msix_request_irq(xe, xe_irq_handler(xe), xe,
DRIVER_NAME "-guc2host", false, &msix);
if (err)
return err;

6
drivers/gpu/drm/xe/xe_vm.c
View File

@ -3369,8 +3369,10 @@ static int vm_bind_ioctl_check_args(struct xe_device *xe, struct xe_vm *vm,
op == DRM_XE_VM_BIND_OP_PREFETCH) ||
XE_IOCTL_DBG(xe, prefetch_region &&
op != DRM_XE_VM_BIND_OP_PREFETCH) ||
XE_IOCTL_DBG(xe, (prefetch_region != DRM_XE_CONSULT_MEM_ADVISE_PREF_LOC &&
!(BIT(prefetch_region) & xe->info.mem_region_mask))) ||
XE_IOCTL_DBG(xe, (prefetch_region != DRM_XE_CONSULT_MEM_ADVISE_PREF_LOC &&
/* Guard against undefined shift in BIT(prefetch_region) */
(prefetch_region >= (sizeof(xe->info.mem_region_mask) * 8) ||
!(BIT(prefetch_region) & xe->info.mem_region_mask)))) ||
XE_IOCTL_DBG(xe, obj &&
op == DRM_XE_VM_BIND_OP_UNMAP) ||
XE_IOCTL_DBG(xe, (flags & DRM_XE_VM_BIND_FLAG_MADVISE_AUTORESET) &&