This reverts commitb739f125e4. We are unfortunately seeing more issues like we did in293837b9ac("Revert "i915: fix remap_io_sg to verify the pgprot""), except this is now for the vm_fault_gtt path, where we are now hitting the same BUG_ON(!pte_none(*pte)): [10887.466150] kernel BUG at mm/memory.c:2183! [10887.466162] invalid opcode: 0000 [#1] PREEMPT SMP PTI [10887.466168] CPU: 0 PID: 7775 Comm: ffmpeg Tainted: G U 5.13.0-rc3-CI-Nightly #1 [10887.466174] Hardware name: To Be Filled By O.E.M. To Be Filled By O.E.M./J4205-ITX, BIOS P1.40 07/14/2017 [10887.466177] RIP: 0010:remap_pfn_range_notrack+0x30f/0x440 [10887.466188] Code: e8 96 d7 e0 ff 84 c0 0f 84 27 01 00 00 48 ba 00 f0 ff ff ff ff 0f 00 4c 89 e0 48 c1 e0 0c 4d 85 ed 75 96 48 21 d0 31 f6 eb a9 <0f> 0b 48 39 37 0f 85 0e 01 00 00 48 8b 0c 24 48 39 4f 08 0f 85 00 [10887.466193] RSP: 0018:ffffc90006e33c50 EFLAGS: 00010286 [10887.466198] RAX: 800000000000002f RBX: 00007f5e01800000 RCX: 0000000000000028 [10887.466201] RDX: 0000000000000001 RSI: ffffea0000000000 RDI: 0000000000000000 [10887.466204] RBP: ffffea000033fea8 R08: 800000000000002f R09: ffff8881072256e0 [10887.466207] R10: ffffc9000b84fff8 R11: 0000000017dab000 R12: 0000000000089f9f [10887.466210] R13: 800000000000002f R14: 00007f5e017e4000 R15: ffff88800cffaf20 [10887.466213] FS: 00007f5e04849640(0000) GS:ffff888278000000(0000) knlGS:0000000000000000 [10887.466216] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [10887.466220] CR2: 00007fd9b191a2ac CR3: 00000001829ac000 CR4: 00000000003506f0 [10887.466223] Call Trace: [10887.466233] vm_fault_gtt+0x1ca/0x5d0 [i915] [10887.466381] ? ktime_get+0x38/0x90 [10887.466389] __do_fault+0x37/0x90 [10887.466395] __handle_mm_fault+0xc46/0x1200 [10887.466402] handle_mm_fault+0xce/0x2a0 [10887.466407] do_user_addr_fault+0x1c5/0x660 Reverting this commit is reported to fix the issue. Reported-by: Eero Tamminen <eero.t.tamminen@intel.com> References: https://gitlab.freedesktop.org/drm/intel/-/issues/3519 Fixes:b739f125e4("i915: use io_mapping_map_user") Cc: Christoph Hellwig <hch@lst.de> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Matthew Auld <matthew.auld@intel.com> Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: https://patchwork.freedesktop.org/patch/msgid/20210527185145.458021-1-matthew.auld@intel.com (cherry picked from commit0e4fe0c9f2) Signed-off-by: Jani Nikula <jani.nikula@intel.com>
150 lines
4.7 KiB
Plaintext
150 lines
4.7 KiB
Plaintext
# SPDX-License-Identifier: GPL-2.0-only
|
|
config DRM_I915
|
|
tristate "Intel 8xx/9xx/G3x/G4x/HD Graphics"
|
|
depends on DRM
|
|
depends on X86 && PCI
|
|
select INTEL_GTT
|
|
select INTERVAL_TREE
|
|
# we need shmfs for the swappable backing store, and in particular
|
|
# the shmem_readpage() which depends upon tmpfs
|
|
select SHMEM
|
|
select TMPFS
|
|
select DRM_KMS_HELPER
|
|
select DRM_PANEL
|
|
select DRM_MIPI_DSI
|
|
select RELAY
|
|
select IRQ_WORK
|
|
# i915 depends on ACPI_VIDEO when ACPI is enabled
|
|
# but for select to work, need to select ACPI_VIDEO's dependencies, ick
|
|
select BACKLIGHT_CLASS_DEVICE if ACPI
|
|
select INPUT if ACPI
|
|
select ACPI_VIDEO if ACPI
|
|
select ACPI_BUTTON if ACPI
|
|
select SYNC_FILE
|
|
select IOSF_MBI
|
|
select CRC32
|
|
select SND_HDA_I915 if SND_HDA_CORE
|
|
select CEC_CORE if CEC_NOTIFIER
|
|
select VMAP_PFN
|
|
help
|
|
Choose this option if you have a system that has "Intel Graphics
|
|
Media Accelerator" or "HD Graphics" integrated graphics,
|
|
including 830M, 845G, 852GM, 855GM, 865G, 915G, 945G, 965G,
|
|
G35, G41, G43, G45 chipsets and Celeron, Pentium, Core i3,
|
|
Core i5, Core i7 as well as Atom CPUs with integrated graphics.
|
|
|
|
This driver is used by the Intel driver in X.org 6.8 and
|
|
XFree86 4.4 and above. It replaces the older i830 module that
|
|
supported a subset of the hardware in older X.org releases.
|
|
|
|
Note that the older i810/i815 chipsets require the use of the
|
|
i810 driver instead, and the Atom z5xx series has an entirely
|
|
different implementation.
|
|
|
|
If "M" is selected, the module will be called i915.
|
|
|
|
config DRM_I915_FORCE_PROBE
|
|
string "Force probe driver for selected new Intel hardware"
|
|
depends on DRM_I915
|
|
help
|
|
This is the default value for the i915.force_probe module
|
|
parameter. Using the module parameter overrides this option.
|
|
|
|
Force probe the driver for new Intel graphics devices that are
|
|
recognized but not properly supported by this kernel version. It is
|
|
recommended to upgrade to a kernel version with proper support as soon
|
|
as it is available.
|
|
|
|
Use "" to disable force probe. If in doubt, use this.
|
|
|
|
Use "<pci-id>[,<pci-id>,...]" to force probe the driver for listed
|
|
devices. For example, "4500" or "4500,4571".
|
|
|
|
Use "*" to force probe the driver for all known devices.
|
|
|
|
config DRM_I915_CAPTURE_ERROR
|
|
bool "Enable capturing GPU state following a hang"
|
|
depends on DRM_I915
|
|
default y
|
|
help
|
|
This option enables capturing the GPU state when a hang is detected.
|
|
This information is vital for triaging hangs and assists in debugging.
|
|
Please report any hang for triaging according to:
|
|
https://gitlab.freedesktop.org/drm/intel/-/wikis/How-to-file-i915-bugs
|
|
|
|
If in doubt, say "Y".
|
|
|
|
config DRM_I915_COMPRESS_ERROR
|
|
bool "Compress GPU error state"
|
|
depends on DRM_I915_CAPTURE_ERROR
|
|
select ZLIB_DEFLATE
|
|
default y
|
|
help
|
|
This option selects ZLIB_DEFLATE if it isn't already
|
|
selected and causes any error state captured upon a GPU hang
|
|
to be compressed using zlib.
|
|
|
|
If in doubt, say "Y".
|
|
|
|
config DRM_I915_USERPTR
|
|
bool "Always enable userptr support"
|
|
depends on DRM_I915
|
|
select MMU_NOTIFIER
|
|
default y
|
|
help
|
|
This option selects CONFIG_MMU_NOTIFIER if it isn't already
|
|
selected to enabled full userptr support.
|
|
|
|
If in doubt, say "Y".
|
|
|
|
config DRM_I915_GVT
|
|
bool "Enable Intel GVT-g graphics virtualization host support"
|
|
depends on DRM_I915
|
|
depends on 64BIT
|
|
default n
|
|
help
|
|
Choose this option if you want to enable Intel GVT-g graphics
|
|
virtualization technology host support with integrated graphics.
|
|
With GVT-g, it's possible to have one integrated graphics
|
|
device shared by multiple VMs under different hypervisors.
|
|
|
|
Note that at least one hypervisor like Xen or KVM is required for
|
|
this driver to work, and it only supports newer device from
|
|
Broadwell+. For further information and setup guide, you can
|
|
visit: http://01.org/igvt-g.
|
|
|
|
Now it's just a stub to support the modifications of i915 for
|
|
GVT device model. It requires at least one MPT modules for Xen/KVM
|
|
and other components of GVT device model to work. Use it under
|
|
you own risk.
|
|
|
|
If in doubt, say "N".
|
|
|
|
config DRM_I915_GVT_KVMGT
|
|
tristate "Enable KVM/VFIO support for Intel GVT-g"
|
|
depends on DRM_I915_GVT
|
|
depends on KVM
|
|
depends on VFIO_MDEV && VFIO_MDEV_DEVICE
|
|
default n
|
|
help
|
|
Choose this option if you want to enable KVMGT support for
|
|
Intel GVT-g.
|
|
|
|
menu "drm/i915 Debugging"
|
|
depends on DRM_I915
|
|
depends on EXPERT
|
|
source "drivers/gpu/drm/i915/Kconfig.debug"
|
|
endmenu
|
|
|
|
menu "drm/i915 Profile Guided Optimisation"
|
|
visible if EXPERT
|
|
depends on DRM_I915
|
|
source "drivers/gpu/drm/i915/Kconfig.profile"
|
|
endmenu
|
|
|
|
menu "drm/i915 Unstable Evolution"
|
|
visible if EXPERT && STAGING && BROKEN
|
|
depends on DRM_I915
|
|
source "drivers/gpu/drm/i915/Kconfig.unstable"
|
|
endmenu
|