Jani Nikula 423ffe62c0 drm/i915: fix display probe for IVB Q and IVB D GT2 server ... The current display probe is unable to differentiate between IVB Q and IVB D GT2 server, as they both have the same device id, but different subvendor and subdevice. This leads to the latter being misidentified as the former, and should just end up not having a display. However, the no display case returns a NULL as the display device info, and promptly oopses. As the IVB Q case is rare, and we're anyway moving towards GMD ID, handle the identification requiring subvendor and subdevice as a special case first, instead of unnecessarily growing the intel_display_ids[] array with subvendor and subdevice. [ 5.425298] BUG: kernel NULL pointer dereference, address: 0000000000000000 [ 5.426059] #PF: supervisor read access in kernel mode [ 5.426810] #PF: error_code(0x0000) - not-present page [ 5.427570] PGD 0 P4D 0 [ 5.428285] Oops: 0000 [#1] PREEMPT SMP PTI [ 5.429035] CPU: 0 PID: 137 Comm: (udev-worker) Not tainted 6.4.0-1-amd64 #1 Debian 6.4.4-1 [ 5.429759] Hardware name: HP HP Z220 SFF Workstation/HP Z220 SFF Workstation, BIOS 4.19-218-gb184e6e0a1 02/02/2023 [ 5.430485] RIP: 0010:intel_device_info_driver_create+0xf1/0x120 [i915] [ 5.431338] Code: 48 8b 97 80 1b 00 00 89 8f c0 1b 00 00 48 89 b7 b0 1b 00 00 48 89 97 b8 1b 00 00 0f b7 fd e8 76 e8 14 00 48 89 83 50 1b 00 00 <48> 8b 08 48 89 8b c4 1b 00 00 48 8b 48 08 48 89 8b cc 1b 00 00 8b [ 5.432920] RSP: 0018:ffffb8254044fb98 EFLAGS: 00010206 [ 5.433707] RAX: 0000000000000000 RBX: ffff923076e80000 RCX: 0000000000000000 [ 5.434494] RDX: 0000000000000260 RSI: 0000000100001000 RDI: 000000000000016a [ 5.435277] RBP: 000000000000016a R08: ffffb8254044fb00 R09: 0000000000000000 [ 5.436055] R10: ffff922d02761de8 R11: 00657361656c6572 R12: ffffffffc0e5d140 [ 5.436867] R13: ffff922d00b720d0 R14: 0000000076e80000 R15: ffff923078c0cae8 [ 5.437646] FS: 00007febd19a18c0(0000) GS:ffff92307c000000(0000) knlGS:0000000000000000 [ 5.438434] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 5.439218] CR2: 0000000000000000 CR3: 000000010256e002 CR4: 00000000001706f0 [ 5.440009] Call Trace: [ 5.440824] <TASK> [ 5.441611] ? __die+0x23/0x70 [ 5.442394] ? page_fault_oops+0x17d/0x4c0 [ 5.443173] ? exc_page_fault+0x7f/0x180 [ 5.443949] ? asm_exc_page_fault+0x26/0x30 [ 5.444756] ? intel_device_info_driver_create+0xf1/0x120 [i915] [ 5.445652] ? intel_device_info_driver_create+0xea/0x120 [i915] [ 5.446545] i915_driver_probe+0x7f/0xb60 [i915] [ 5.447431] ? drm_privacy_screen_get+0x15c/0x1a0 [drm] [ 5.448240] local_pci_probe+0x45/0xa0 [ 5.449013] pci_device_probe+0xc7/0x240 [ 5.449748] really_probe+0x19e/0x3e0 [ 5.450464] ? __pfx___driver_attach+0x10/0x10 [ 5.451172] __driver_probe_device+0x78/0x160 [ 5.451870] driver_probe_device+0x1f/0x90 [ 5.452601] __driver_attach+0xd2/0x1c0 [ 5.453293] bus_for_each_dev+0x88/0xd0 [ 5.453989] bus_add_driver+0x116/0x220 [ 5.454672] driver_register+0x59/0x100 [ 5.455336] i915_init+0x25/0xc0 [i915] [ 5.456104] ? __pfx_i915_init+0x10/0x10 [i915] [ 5.456882] do_one_initcall+0x5d/0x240 [ 5.457511] do_init_module+0x60/0x250 [ 5.458126] __do_sys_finit_module+0xac/0x120 [ 5.458721] do_syscall_64+0x60/0xc0 [ 5.459314] ? syscall_exit_to_user_mode+0x1b/0x40 [ 5.459897] ? do_syscall_64+0x6c/0xc0 [ 5.460510] entry_SYSCALL_64_after_hwframe+0x72/0xdc [ 5.461082] RIP: 0033:0x7febd20b0eb9 [ 5.461648] Code: 08 89 e8 5b 5d c3 66 2e 0f 1f 84 00 00 00 00 00 90 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d 2f 1f 0d 00 f7 d8 64 89 01 48 [ 5.462905] RSP: 002b:00007fffabb1ba78 EFLAGS: 00000246 ORIG_RAX: 0000000000000139 [ 5.463554] RAX: ffffffffffffffda RBX: 0000561e6304f410 RCX: 00007febd20b0eb9 [ 5.464201] RDX: 0000000000000000 RSI: 00007febd2244f0d RDI: 0000000000000015 [ 5.464869] RBP: 00007febd2244f0d R08: 0000000000000000 R09: 000000000000000a [ 5.465512] R10: 0000000000000015 R11: 0000000000000246 R12: 0000000000020000 [ 5.466124] R13: 0000000000000000 R14: 0000561e63032b60 R15: 000000000000000a [ 5.466700] </TASK> [ 5.467271] Modules linked in: i915(+) drm_buddy video crc32_pclmul sr_mod hid_generic wmi crc32c_intel i2c_algo_bit sd_mod cdrom drm_display_helper cec usbhid rc_core ghash_clmulni_intel hid sha512_ssse3 ttm sha512_generic xhci_pci ehci_pci xhci_hcd ehci_hcd nvme ahci drm_kms_helper nvme_core libahci t10_pi libata psmouse aesni_intel scsi_mod crypto_simd i2c_i801 scsi_common crc64_rocksoft_generic cryptd i2c_smbus drm lpc_ich crc64_rocksoft crc_t10dif e1000e usbcore crct10dif_generic usb_common crct10dif_pclmul crc64 crct10dif_common button [ 5.469750] CR2: 0000000000000000 [ 5.470364] ---[ end trace 0000000000000000 ]--- [ 5.470971] RIP: 0010:intel_device_info_driver_create+0xf1/0x120 [i915] [ 5.471699] Code: 48 8b 97 80 1b 00 00 89 8f c0 1b 00 00 48 89 b7 b0 1b 00 00 48 89 97 b8 1b 00 00 0f b7 fd e8 76 e8 14 00 48 89 83 50 1b 00 00 <48> 8b 08 48 89 8b c4 1b 00 00 48 8b 48 08 48 89 8b cc 1b 00 00 8b [ 5.473034] RSP: 0018:ffffb8254044fb98 EFLAGS: 00010206 [ 5.473698] RAX: 0000000000000000 RBX: ffff923076e80000 RCX: 0000000000000000 [ 5.474371] RDX: 0000000000000260 RSI: 0000000100001000 RDI: 000000000000016a [ 5.475045] RBP: 000000000000016a R08: ffffb8254044fb00 R09: 0000000000000000 [ 5.475725] R10: ffff922d02761de8 R11: 00657361656c6572 R12: ffffffffc0e5d140 [ 5.476405] R13: ffff922d00b720d0 R14: 0000000076e80000 R15: ffff923078c0cae8 [ 5.477124] FS: 00007febd19a18c0(0000) GS:ffff92307c000000(0000) knlGS:0000000000000000 [ 5.477811] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 5.478499] CR2: 0000000000000000 CR3: 000000010256e002 CR4: 00000000001706f0 Fixes: 69d439818f ("drm/i915/display: Make display responsible for probing its own IP") Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/8991 Cc: Matt Roper <matthew.d.roper@intel.com> Cc: Andrzej Hajda <andrzej.hajda@intel.com> Reviewed-by: Luca Coelho <luciano.coelho@intel.com> Reviewed-by: Matt Roper <matthew.d.roper@intel.com> Signed-off-by: Jani Nikula <jani.nikula@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20230804084600.1005818-1-jani.nikula@intel.com (cherry picked from commit 1435188307) Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>		2023-08-14 11:59:30 -04:00
..
accel	Memory leak fixes in drm/client, memory access/leak fixes for	2023-07-21 12:14:05 +10:00
accessibility	…
acpi	ACPI/IORT: Remove erroneous id_count check in iort_node_get_rmr_info()	2023-07-28 14:50:50 +01:00
amba	…
android	…
ata	ata: libata-core: fix when to fetch sense data for successful commands	2023-07-28 11:30:34 +09:00
atm	…
auxdisplay	drm changes for 6.5-rc1:	2023-06-29 11:00:17 -07:00
base	PM: sleep: wakeirq: drop unused enable helpers	2023-07-24 09:51:51 +02:00
bcma	…
block	A patch to reduce the potential for erroneous RBD exclusive lock	2023-07-28 10:47:24 -07:00
bluetooth	Bluetooth: btusb: Fix bluetooth on Intel Macbook 2014	2023-07-20 11:26:56 -07:00
bus	SoC fixes for 6.5, part 1	2023-07-06 09:56:53 -07:00
cdrom	cdrom/gdrom: Fix build error	2023-06-29 08:09:31 -06:00
cdx	…
char	tpm_tis: Explicitly check for error code	2023-07-28 18:13:39 +00:00
clk	Another set of clk driver updates and fixes for the merge window. The	2023-07-04 11:07:45 -07:00
clocksource	RISC-V Patches for the 6.5 Merge Window, Part 1	2023-06-30 09:37:26 -07:00
comedi	…
connector	…
counter	…
cpufreq	cpufreq: sparc: Don't mark cpufreq callbacks with __init	2023-07-12 12:45:18 +02:00
cpuidle	…
crypto	s390 updates for 6.5 merge window part 2	2023-07-06 13:18:30 -07:00
cxl	cxl/acpi: Return 'rc' instead of '0' in cxl_parse_cfmws()	2023-07-18 11:55:09 -06:00
dax	…
dca	…
devfreq	…
dio	…
dma	dmaengine updates for v6.5	2023-07-06 09:48:31 -07:00
dma-buf	dma-buf/dma-resv: Stop leaking on krealloc() failure	2023-07-15 13:57:30 +02:00
edac	…
eisa	…
extcon	…
firewire	…
firmware	Char/Misc and other driver subsystem updates for 6.5-rc1	2023-07-03 12:46:47 -07:00
fpga	Char/Misc and other driver subsystem updates for 6.5-rc1	2023-07-03 12:46:47 -07:00
fsi	…
gnss	…
gpio	gpio: mvebu: fix irq domain leak	2023-07-20 14:38:36 +02:00
gpu	drm/i915: fix display probe for IVB Q and IVB D GT2 server	2023-08-14 11:59:30 -04:00
greybus	…
hid	for-linus-2023071101	2023-07-12 11:56:22 -07:00
hsi	…
hte	…
hv	…
hwmon	hwmon: (k10temp) Enable AMD3255 Proc to show negative temperature	2023-07-27 09:41:07 -07:00
hwspinlock	…
hwtracing	Char/Misc and other driver subsystem updates for 6.5-rc1	2023-07-03 12:46:47 -07:00
i2c	Part 2 of I2C patches for 6.5	2023-07-08 12:28:00 -07:00
i3c	…
idle	Revert "intel_idle: Add support for using intel_idle in a VM guest using just hlt"	2023-07-19 20:10:03 +02:00
iio	driver core changes for 6.5-rc1	2023-07-03 12:56:23 -07:00
infiniband	RDMA/irdma: Report correct WC error	2023-07-26 14:58:42 +03:00
input	ARM: SoC changes for 6.5	2023-06-29 15:28:33 -07:00
interconnect	…
iommu	iommufd: Set end correctly when doing batch carry	2023-07-27 11:27:20 -03:00
ipack	…
irqchip	- Work around an erratum on GIC700, where a race between a CPU	2023-07-30 10:59:19 -07:00
isdn	…
leds	- New Drivers	2023-07-03 11:26:05 -07:00
macintosh	…
mailbox	mailbox: ti-msgmgr: Fill non-message tx data fields with 0x0	2023-06-30 17:35:45 -05:00
mcb	…
md	dm cache policy smq: ensure IO doesn't prevent cleaner policy progress	2023-07-25 11:55:50 -04:00
media	media: verisilicon: change confusingly named relaxed register access	2023-07-14 09:14:10 +02:00
memory	asm-generic updates for 6.5	2023-07-06 10:06:04 -07:00
memstick	…
message	…
mfd	- New Drivers	2023-07-03 10:55:04 -07:00
misc	misc/genalloc: Name subpools by of_node_full_name()	2023-07-26 09:45:01 +02:00
mmc	mmc: Revert "mmc: core: Allow mmc_start_host() synchronously detect a card"	2023-06-30 14:06:51 +02:00
most	…
mtd	Core MTD changes:	2023-06-28 14:02:03 -07:00
mux	…
net	benet: fix return value check in be_lancer_xmit_workarounds()	2023-07-27 10:31:38 +02:00
nfc	…
ntb	ntb: hw: amd: Fix debugfs_create_dir error checking	2023-07-08 13:55:44 -04:00
nubus	…
nvdimm	…
nvme	SCSI fixes on 20230714	2023-07-14 19:57:29 -07:00
nvmem	…
of	of: Preserve "of-display" device name for compatibility	2023-07-11 16:33:01 -06:00
opp	…
parisc	parisc: Move init function declarations into header file	2023-06-30 17:14:15 +02:00
parport	Char/Misc and other driver subsystem updates for 6.5-rc1	2023-07-03 12:46:47 -07:00
pci	Fixes for pci_clean_master, error handling in driver inits, and various	2023-07-09 09:35:51 -07:00
pcmcia	…
peci	…
perf	perf: RISC-V: Remove PERF_HES_STOPPED flag checking in riscv_pmu_start()	2023-07-12 07:41:23 -07:00
phy	phy: hisilicon: Fix an out of bounds check in hisi_inno_phy_probe()	2023-07-24 16:23:37 +05:30
pinctrl	pinctrl: renesas: Fixes for v6.5	2023-07-13 00:05:52 +02:00
platform	platform/x86: huawei-wmi: Silence ambient light sensor	2023-07-25 16:38:03 +02:00
pnp	…
power	power supply and reset changes for the 6.5 series	2023-07-03 17:23:16 -07:00
powercap	ARM: SoC drivers for 6.5	2023-06-29 15:22:19 -07:00
pps	…
ps3	…
ptp	ptp: Make max_phase_adjustment sysfs device attribute invisible when not supported	2023-07-03 13:17:25 -07:00
pwm	pwm: Changes for v6.5-rc1	2023-07-05 12:55:06 -07:00
rapidio	…
ras	…
regulator	regulator: mt6358: Fix incorrect VCN33 sync error message	2023-07-23 23:40:09 +01:00
remoteproc	remoteproc updates for v6.5	2023-07-03 17:03:05 -07:00
reset	ARM: SoC drivers for 6.5	2023-06-29 15:22:19 -07:00
rpmsg	…
rtc	RTC for 6.5	2023-07-03 10:43:10 -07:00
s390	block-6.5-2023-07-28	2023-07-28 10:23:41 -07:00
sbus	…
scsi	scsi: sg: Fix checking return value of blk_get_queue()	2023-07-19 23:12:13 -04:00
sh	…
siox	…
slimbus	…
soc	USB / Thunderbolt driver updates for 6.5-rc1	2023-07-03 13:23:10 -07:00
soundwire	soundwire: amd: Fix a check for errors in probe()	2023-07-13 11:09:07 +05:30
spi	spi: spi-qcom-qspi: Add mem_ops to avoid PIO for badly sized reads	2023-07-26 12:47:20 +01:00
spmi	…
ssb	…
staging	Staging driver fixes for 6.5-rc4	2023-07-30 11:47:56 -07:00
target	SCSI misc on 20230708	2023-07-08 12:35:18 -07:00
tc	…
tee	ARM: SoC drivers for 6.5	2023-06-29 15:22:19 -07:00
thermal	thermal: of: fix double-free on unregistration	2023-07-24 09:51:31 +02:00
thunderbolt	…
tty	TTY/Serial fixes for 6.5-rc4	2023-07-30 11:51:36 -07:00
ufs	Merge branch '6.5/scsi-staging' into 6.5/scsi-fixes	2023-07-11 12:15:15 -04:00
uio	…
usb	usb: misc: ehset: fix wrong if condition	2023-07-27 10:37:30 +02:00
vdpa	virtio: features, fixes, cleanups	2023-07-03 15:38:26 -07:00
vfio	VFIO updates for v6.5-rc1	2023-06-30 15:22:09 -07:00
vhost	virtio: features, fixes, cleanups	2023-07-03 15:38:26 -07:00
video	fbdev: Explicitly include correct DT includes	2023-07-20 07:56:30 +02:00
virt	workqueue: Ordered workqueue creation cleanups	2023-06-27 16:46:06 -07:00
virtio	…
vlynq	…
w1	…
watchdog	…
xen	xen: speed up grant-table reclaim	2023-07-27 07:53:12 +02:00
zorro	…
Kconfig	…
Makefile	…