136 lines
5.5 KiB
Diff
136 lines
5.5 KiB
Diff
diff --unified --recursive --text package.orig/drivers/gpu/drm/i915/display/intel_display_driver.c package.new/drivers/gpu/drm/i915/display/intel_display_driver.c
|
|
--- package.orig/drivers/gpu/drm/i915/display/intel_display_driver.c 2023-09-23 10:14:39.000000000 +0100
|
|
+++ package.new/drivers/gpu/drm/i915/display/intel_display_driver.copy.c 2023-10-02 11:08:54.420518964 +0100
|
|
@@ -203,9 +203,11 @@
|
|
|
|
intel_bios_init(i915);
|
|
|
|
- ret = intel_vga_register(i915);
|
|
- if (ret)
|
|
- goto cleanup_bios;
|
|
+ if (!i915_modparams.enable_hd_vgaarb || !HAS_PCH_SPLIT(i915)) {
|
|
+ ret = intel_vga_register(i915);
|
|
+ if (ret)
|
|
+ goto cleanup_bios;
|
|
+ }
|
|
|
|
/* FIXME: completely on the wrong abstraction layer */
|
|
ret = intel_power_domains_init(i915);
|
|
@@ -364,6 +366,12 @@
|
|
if (ret)
|
|
return ret;
|
|
|
|
+ /*
|
|
+ * Must do this after fbcon init so that
|
|
+ * vgacon_save_screen() works during the handover.
|
|
+ */
|
|
+ intel_vga_disable_mem(i915);
|
|
+
|
|
/* Only enable hotplug handling once the fbdev is fully set up. */
|
|
intel_hpd_init(i915);
|
|
intel_hpd_poll_disable(i915);
|
|
@@ -410,6 +418,7 @@
|
|
if (!HAS_DISPLAY(i915))
|
|
return;
|
|
|
|
+ intel_vga_enable_mem(i915);
|
|
flush_workqueue(i915->display.wq.flip);
|
|
flush_workqueue(i915->display.wq.modeset);
|
|
|
|
diff --unified --recursive --text package.orig/drivers/gpu/drm/i915/display/intel_display.h package.new/drivers/gpu/drm/i915/display/intel_display.h
|
|
--- package.orig/drivers/gpu/drm/i915/display/intel_display.h 2023-08-26 21:42:01.223519415 +0200
|
|
+++ package.new/drivers/gpu/drm/i915/display/intel_display.h 2023-08-26 21:47:01.677083488 +0200
|
|
@@ -426,6 +426,7 @@
|
|
int vlv_get_hpll_vco(struct drm_i915_private *dev_priv);
|
|
int vlv_get_cck_clock(struct drm_i915_private *dev_priv,
|
|
const char *name, u32 reg, int ref_freq);
|
|
+extern void intel_vga_disable_mem(struct drm_i915_private *dev_priv);
|
|
int vlv_get_cck_clock_hpll(struct drm_i915_private *dev_priv,
|
|
const char *name, u32 reg);
|
|
void intel_init_display_hooks(struct drm_i915_private *dev_priv);
|
|
diff --unified --recursive --text package.orig/drivers/gpu/drm/i915/display/intel_vga.c package.new/drivers/gpu/drm/i915/display/intel_vga.c
|
|
--- package.orig/drivers/gpu/drm/i915/display/intel_vga.c 2023-08-26 21:42:01.230186236 +0200
|
|
+++ package.new/drivers/gpu/drm/i915/display/intel_vga.c 2023-08-26 21:47:01.677083488 +0200
|
|
@@ -47,6 +47,36 @@
|
|
intel_de_posting_read(dev_priv, vga_reg);
|
|
}
|
|
|
|
+void intel_vga_enable_mem(struct drm_i915_private *dev_priv)
|
|
+{
|
|
+ struct pci_dev *pdev = to_pci_dev(dev_priv->drm.dev);
|
|
+
|
|
+ /* Enable VGA memory on Intel HD */
|
|
+ if (i915_modparams.enable_hd_vgaarb && HAS_PCH_SPLIT(dev_priv)) {
|
|
+ vga_get_uninterruptible(pdev, VGA_RSRC_LEGACY_IO);
|
|
+ outb(inb(VGA_MIS_R) | (1 << 1), VGA_MIS_W);
|
|
+ vga_set_legacy_decoding(pdev, VGA_RSRC_LEGACY_IO |
|
|
+ VGA_RSRC_LEGACY_MEM |
|
|
+ VGA_RSRC_NORMAL_IO |
|
|
+ VGA_RSRC_NORMAL_MEM);
|
|
+ vga_put(pdev, VGA_RSRC_LEGACY_IO);
|
|
+ }
|
|
+}
|
|
+
|
|
+void intel_vga_disable_mem(struct drm_i915_private *dev_priv)
|
|
+{
|
|
+ struct pci_dev *pdev = to_pci_dev(dev_priv->drm.dev);
|
|
+ /* Disable VGA memory on Intel HD */
|
|
+ if (i915_modparams.enable_hd_vgaarb && HAS_PCH_SPLIT(dev_priv)) {
|
|
+ vga_get_uninterruptible(pdev, VGA_RSRC_LEGACY_IO);
|
|
+ outb(inb(VGA_MIS_R) & ~(1 << 1), VGA_MIS_W);
|
|
+ vga_set_legacy_decoding(pdev, VGA_RSRC_LEGACY_IO |
|
|
+ VGA_RSRC_NORMAL_IO |
|
|
+ VGA_RSRC_NORMAL_MEM);
|
|
+ vga_put(pdev, VGA_RSRC_LEGACY_IO);
|
|
+ }
|
|
+}
|
|
+
|
|
void intel_vga_redisable_power_on(struct drm_i915_private *dev_priv)
|
|
{
|
|
i915_reg_t vga_reg = intel_vga_cntrl_reg(dev_priv);
|
|
@@ -55,6 +85,7 @@
|
|
drm_dbg_kms(&dev_priv->drm,
|
|
"Something enabled VGA plane, disabling it\n");
|
|
intel_vga_disable(dev_priv);
|
|
+ intel_vga_disable_mem(dev_priv);
|
|
}
|
|
}
|
|
|
|
diff --unified --recursive --text package.orig/drivers/gpu/drm/i915/display/intel_vga.h package.new/drivers/gpu/drm/i915/display/intel_vga.h
|
|
--- package.orig/drivers/gpu/drm/i915/display/intel_vga.h 2023-08-26 21:42:01.230186236 +0200
|
|
+++ package.new/drivers/gpu/drm/i915/display/intel_vga.h 2023-08-26 21:47:01.677083488 +0200
|
|
@@ -15,4 +15,8 @@
|
|
int intel_vga_register(struct drm_i915_private *i915);
|
|
void intel_vga_unregister(struct drm_i915_private *i915);
|
|
|
|
+/* i915 vga arb patch */
|
|
+void intel_vga_enable_mem(struct drm_i915_private *i915);
|
|
+void intel_vga_disable_mem(struct drm_i915_private *i915);
|
|
+
|
|
#endif /* __INTEL_VGA_H__ */
|
|
diff --unified --recursive --text package.orig/drivers/gpu/drm/i915/i915_params.c package.new/drivers/gpu/drm/i915/i915_params.c
|
|
--- package.orig/drivers/gpu/drm/i915/i915_params.c 2023-08-26 21:42:01.243519878 +0200
|
|
+++ package.new/drivers/gpu/drm/i915/i915_params.c 2023-08-26 21:47:01.680416897 +0200
|
|
@@ -160,6 +160,9 @@
|
|
i915_param_named(disable_display, bool, 0400,
|
|
"Disable display (default: false)");
|
|
|
|
+i915_param_named(enable_hd_vgaarb, bool, 0444,
|
|
+ "Enable support for VGA arbitration on Intel HD IGD. (default: false)");
|
|
+
|
|
i915_param_named(memtest, bool, 0400,
|
|
"Perform a read/write test of all device memory on module load (default: off)");
|
|
|
|
diff --unified --recursive --text package.orig/drivers/gpu/drm/i915/i915_params.h package.new/drivers/gpu/drm/i915/i915_params.h
|
|
--- package.orig/drivers/gpu/drm/i915/i915_params.h 2023-08-26 21:42:01.243519878 +0200
|
|
+++ package.new/drivers/gpu/drm/i915/i915_params.h 2023-08-26 21:47:01.680416897 +0200
|
|
@@ -79,6 +79,7 @@
|
|
param(unsigned int, lmem_size, 0, 0400) \
|
|
param(unsigned int, lmem_bar_size, 0, 0400) \
|
|
/* leave bools at the end to not create holes */ \
|
|
+ param(bool, enable_hd_vgaarb, false, 0600) \
|
|
param(bool, enable_hangcheck, true, 0600) \
|
|
param(bool, load_detect_test, false, 0600) \
|
|
param(bool, force_reset_modeset_test, false, 0600) \
|
|
--
|