Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'drm-misc-fixes-2026-03-26' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-fixes
A page mapping fix for shmem fault handler, a power-off fix for ivpu, a
GFP_* flag fix for syncobj, and a MAINTAINERS update.
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maxime Ripard <mripard@redhat.com>
Link: https://patch.msgid.link/20260326-lush-cuddly-limpet-ab2aa9@houat
+41
-26
+7
-1
MAINTAINERS
+7
-1
MAINTAINERS
···
8628
8628
F: include/uapi/drm/lima_drm.h
8629
8629
8630
8630
DRM DRIVERS FOR LOONGSON
8631
+
M: Jianmin Lv <lvjianmin@loongson.cn>
8632
+
M: Qianhai Wu <wuqianhai@loongson.cn>
8633
+
R: Huacai Chen <chenhuacai@kernel.org>
8634
+
R: Mingcong Bai <jeffbai@aosc.io>
8635
+
R: Xi Ruoyao <xry111@xry111.site>
8636
+
R: Icenowy Zheng <zhengxingda@iscas.ac.cn>
8631
8637
L: dri-devel@lists.freedesktop.org
8632
-
S: Orphan
8638
+
S: Maintained
8633
8639
T: git https://gitlab.freedesktop.org/drm/misc/kernel.git
8634
8640
F: drivers/gpu/drm/loongson/
8635
8641
+1
drivers/accel/ivpu/ivpu_drv.h
+1
drivers/accel/ivpu/ivpu_drv.h
+4
-2
drivers/accel/ivpu/ivpu_hw.c
+4
-2
drivers/accel/ivpu/ivpu_hw.c
···
70
70
if (ivpu_hw_btrs_gen(vdev) == IVPU_HW_BTRS_MTL)
71
71
vdev->wa.interrupt_clear_with_0 = ivpu_hw_btrs_irqs_clear_with_0_mtl(vdev);
72
72
73
-
if (ivpu_device_id(vdev) == PCI_DEVICE_ID_LNL &&
74
-
ivpu_revision(vdev) < IVPU_HW_IP_REV_LNL_B0)
73
+
if ((ivpu_device_id(vdev) == PCI_DEVICE_ID_LNL &&
74
+
ivpu_revision(vdev) < IVPU_HW_IP_REV_LNL_B0) ||
75
+
(ivpu_device_id(vdev) == PCI_DEVICE_ID_NVL &&
76
+
ivpu_revision(vdev) == IVPU_HW_IP_REV_NVL_A0))
75
77
vdev->wa.disable_clock_relinquish = true;
76
78
77
79
if (ivpu_test_mode & IVPU_TEST_MODE_CLK_RELINQ_ENABLE)
+27
-21
drivers/gpu/drm/drm_gem_shmem_helper.c
+27
-21
drivers/gpu/drm/drm_gem_shmem_helper.c
···
550
550
}
551
551
EXPORT_SYMBOL_GPL(drm_gem_shmem_dumb_create);
552
552
553
-
static bool drm_gem_shmem_try_map_pmd(struct vm_fault *vmf, unsigned long addr,
554
-
struct page *page)
553
+
static vm_fault_t try_insert_pfn(struct vm_fault *vmf, unsigned int order,
554
+
unsigned long pfn)
555
555
{
556
+
if (!order) {
557
+
return vmf_insert_pfn(vmf->vma, vmf->address, pfn);
556
558
#ifdef CONFIG_ARCH_SUPPORTS_PMD_PFNMAP
557
-
unsigned long pfn = page_to_pfn(page);
558
-
unsigned long paddr = pfn << PAGE_SHIFT;
559
-
bool aligned = (addr & ~PMD_MASK) == (paddr & ~PMD_MASK);
559
+
} else if (order == PMD_ORDER) {
560
+
unsigned long paddr = pfn << PAGE_SHIFT;
561
+
bool aligned = (vmf->address & ~PMD_MASK) == (paddr & ~PMD_MASK);
560
562
561
-
if (aligned &&
562
-
pmd_none(*vmf->pmd) &&
563
-
folio_test_pmd_mappable(page_folio(page))) {
564
-
pfn &= PMD_MASK >> PAGE_SHIFT;
565
-
if (vmf_insert_pfn_pmd(vmf, pfn, false) == VM_FAULT_NOPAGE)
566
-
return true;
567
-
}
563
+
if (aligned &&
564
+
folio_test_pmd_mappable(page_folio(pfn_to_page(pfn)))) {
565
+
pfn &= PMD_MASK >> PAGE_SHIFT;
566
+
return vmf_insert_pfn_pmd(vmf, pfn, false);
567
+
}
568
568
#endif
569
-
570
-
return false;
569
+
}
570
+
return VM_FAULT_FALLBACK;
571
571
}
572
572
573
-
static vm_fault_t drm_gem_shmem_fault(struct vm_fault *vmf)
573
+
static vm_fault_t drm_gem_shmem_any_fault(struct vm_fault *vmf, unsigned int order)
574
574
{
575
575
struct vm_area_struct *vma = vmf->vma;
576
576
struct drm_gem_object *obj = vma->vm_private_data;
···
580
580
struct page **pages = shmem->pages;
581
581
pgoff_t page_offset;
582
582
unsigned long pfn;
583
+
584
+
if (order && order != PMD_ORDER)
585
+
return VM_FAULT_FALLBACK;
583
586
584
587
/* Offset to faulty address in the VMA. */
585
588
page_offset = vmf->pgoff - vma->vm_pgoff;
···
596
593
goto out;
597
594
}
598
595
599
-
if (drm_gem_shmem_try_map_pmd(vmf, vmf->address, pages[page_offset])) {
600
-
ret = VM_FAULT_NOPAGE;
601
-
goto out;
602
-
}
603
-
604
596
pfn = page_to_pfn(pages[page_offset]);
605
-
ret = vmf_insert_pfn(vma, vmf->address, pfn);
597
+
ret = try_insert_pfn(vmf, order, pfn);
606
598
607
599
out:
608
600
dma_resv_unlock(shmem->base.resv);
609
601
610
602
return ret;
603
+
}
604
+
605
+
static vm_fault_t drm_gem_shmem_fault(struct vm_fault *vmf)
606
+
{
607
+
return drm_gem_shmem_any_fault(vmf, 0);
611
608
}
612
609
613
610
static void drm_gem_shmem_vm_open(struct vm_area_struct *vma)
···
646
643
647
644
const struct vm_operations_struct drm_gem_shmem_vm_ops = {
648
645
.fault = drm_gem_shmem_fault,
646
+
#ifdef CONFIG_ARCH_SUPPORTS_PMD_PFNMAP
647
+
.huge_fault = drm_gem_shmem_any_fault,
648
+
#endif
649
649
.open = drm_gem_shmem_vm_open,
650
650
.close = drm_gem_shmem_vm_close,
651
651
};
+2
-2
drivers/gpu/drm/drm_syncobj.c
+2
-2
drivers/gpu/drm/drm_syncobj.c
···
602
602
drm_syncobj_get(syncobj);
603
603
604
604
ret = xa_alloc(&file_private->syncobj_xa, handle, syncobj, xa_limit_32b,
605
-
GFP_NOWAIT);
605
+
GFP_KERNEL);
606
606
if (ret)
607
607
drm_syncobj_put(syncobj);
608
608
···
716
716
drm_syncobj_get(syncobj);
717
717
718
718
ret = xa_alloc(&file_private->syncobj_xa, handle, syncobj, xa_limit_32b,
719
-
GFP_NOWAIT);
719
+
GFP_KERNEL);
720
720
if (ret)
721
721
drm_syncobj_put(syncobj);
722
722