drm/i915: Only reset console if enabled

6by9 · 6by9 · commit 94d0c72ec917 · 2025-10-08T11:03:27.000+01:00
Taken from https://github.com/chimera-linux/cports/blob/master/main/linux-stable/patches/xe-nonx86.patch Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
diff --git a/drivers/gpu/drm/i915/display/intel_vga.c b/drivers/gpu/drm/i915/display/intel_vga.c
@@ -78,6 +78,7 @@ void intel_vga_disable(struct intel_display *display)
 
 void intel_vga_reset_io_mem(struct intel_display *display)
 {
+#if defined(CONFIG_VGA_CONSOLE)
 	struct pci_dev *pdev = to_pci_dev(display->drm->dev);
 
 	/*
@@ -93,6 +94,7 @@ void intel_vga_reset_io_mem(struct intel_display *display)
 	vga_get_uninterruptible(pdev, VGA_RSRC_LEGACY_IO);
 	outb(inb(VGA_MIS_R), VGA_MIS_W);
 	vga_put(pdev, VGA_RSRC_LEGACY_IO);
+#endif
 }
 
 int intel_vga_register(struct intel_display *display)

Original file line number	Diff line number	Diff line change
`@@ -78,6 +78,7 @@ void intel_vga_disable(struct intel_display *display)`
`78`	`78`
`79`	`79`	`void intel_vga_reset_io_mem(struct intel_display *display)`
`80`	`80`	`{`
	`81`	`+#if defined(CONFIG_VGA_CONSOLE)`
`81`	`82`	`struct pci_dev *pdev = to_pci_dev(display->drm->dev);`
`82`	`83`
`83`	`84`	`/*`
`@@ -93,6 +94,7 @@ void intel_vga_reset_io_mem(struct intel_display *display)`
`93`	`94`	`vga_get_uninterruptible(pdev, VGA_RSRC_LEGACY_IO);`
`94`	`95`	`outb(inb(VGA_MIS_R), VGA_MIS_W);`
`95`	`96`	`vga_put(pdev, VGA_RSRC_LEGACY_IO);`
	`97`	`+#endif`
`96`	`98`	`}`
`97`	`99`
`98`	`100`	`int intel_vga_register(struct intel_display *display)`