Bump to 6.5.5.arch1
Signed-off-by: Nikolaos Karaolidis <nick@karaolidis.com>
This commit is contained in:
@@ -1,26 +1,10 @@
|
||||
From c8894968896294c7ced91b86fb59ca2c1aa6e031 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?=C3=A9clairevoyant?=
|
||||
<848000+eclairevoyant@users.noreply.github.com>
|
||||
Date: Sun, 1 Jan 2023 16:21:24 -0500
|
||||
Subject: [PATCH 2/2] i915-vga-arbiter
|
||||
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 @@
|
||||
|
||||
---
|
||||
drivers/gpu/drm/i915/display/intel_display.c | 15 ++++++++--
|
||||
drivers/gpu/drm/i915/display/intel_display.h | 1 +
|
||||
drivers/gpu/drm/i915/display/intel_vga.c | 31 ++++++++++++++++++++
|
||||
drivers/gpu/drm/i915/display/intel_vga.h | 4 +++
|
||||
drivers/gpu/drm/i915/i915_params.c | 3 ++
|
||||
drivers/gpu/drm/i915/i915_params.h | 1 +
|
||||
6 files changed, 52 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
|
||||
index de77054195c6..507ee4e0d1dc 100644
|
||||
--- a/drivers/gpu/drm/i915/display/intel_display.c
|
||||
+++ b/drivers/gpu/drm/i915/display/intel_display.c
|
||||
@@ -8656,9 +8656,11 @@ int intel_modeset_init_noirq(struct drm_i915_private *i915)
|
||||
|
||||
intel_bios_init(i915);
|
||||
|
||||
|
||||
- ret = intel_vga_register(i915);
|
||||
- if (ret)
|
||||
- goto cleanup_bios;
|
||||
@@ -29,13 +13,13 @@ index de77054195c6..507ee4e0d1dc 100644
|
||||
+ if (ret)
|
||||
+ goto cleanup_bios;
|
||||
+ }
|
||||
|
||||
|
||||
/* FIXME: completely on the wrong abstraction layer */
|
||||
intel_power_domains_init_hw(i915, false);
|
||||
@@ -8807,6 +8809,12 @@ int intel_modeset_init(struct drm_i915_private *i915)
|
||||
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.
|
||||
@@ -45,19 +29,18 @@ index de77054195c6..507ee4e0d1dc 100644
|
||||
/* Only enable hotplug handling once the fbdev is fully set up. */
|
||||
intel_hpd_init(i915);
|
||||
intel_hpd_poll_disable(i915);
|
||||
@@ -8977,6 +8985,7 @@ void intel_modeset_driver_remove(struct drm_i915_private *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 --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h
|
||||
index 884e8e67b17c..90f932db61f0 100644
|
||||
--- a/drivers/gpu/drm/i915/display/intel_display.h
|
||||
+++ b/drivers/gpu/drm/i915/display/intel_display.h
|
||||
@@ -576,6 +576,7 @@ void i830_disable_pipe(struct drm_i915_private *dev_priv, enum pipe pipe);
|
||||
|
||||
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);
|
||||
@@ -65,14 +48,13 @@ index 884e8e67b17c..90f932db61f0 100644
|
||||
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 --git a/drivers/gpu/drm/i915/display/intel_vga.c b/drivers/gpu/drm/i915/display/intel_vga.c
|
||||
index b5d058404c14..ad23732a9f21 100644
|
||||
--- a/drivers/gpu/drm/i915/display/intel_vga.c
|
||||
+++ b/drivers/gpu/drm/i915/display/intel_vga.c
|
||||
@@ -45,6 +45,36 @@ void intel_vga_disable(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);
|
||||
@@ -106,46 +88,43 @@ index b5d058404c14..ad23732a9f21 100644
|
||||
void intel_vga_redisable_power_on(struct drm_i915_private *dev_priv)
|
||||
{
|
||||
i915_reg_t vga_reg = intel_vga_cntrl_reg(dev_priv);
|
||||
@@ -53,6 +83,7 @@ void intel_vga_redisable_power_on(struct drm_i915_private *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 --git a/drivers/gpu/drm/i915/display/intel_vga.h b/drivers/gpu/drm/i915/display/intel_vga.h
|
||||
index ba5b55b917f0..7e2af7924e99 100644
|
||||
--- a/drivers/gpu/drm/i915/display/intel_vga.h
|
||||
+++ b/drivers/gpu/drm/i915/display/intel_vga.h
|
||||
@@ -15,4 +15,8 @@ void intel_vga_redisable_power_on(struct drm_i915_private *i915);
|
||||
|
||||
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 --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c
|
||||
index d1e4d528cb17..a00cbc6591b0 100644
|
||||
--- a/drivers/gpu/drm/i915/i915_params.c
|
||||
+++ b/drivers/gpu/drm/i915/i915_params.c
|
||||
@@ -154,6 +154,9 @@ i915_param_named_unsafe(invert_brightness, int, 0400,
|
||||
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 --git a/drivers/gpu/drm/i915/i915_params.h b/drivers/gpu/drm/i915/i915_params.h
|
||||
index 2733cb6cfe09..f21c5b1529cc 100644
|
||||
--- a/drivers/gpu/drm/i915/i915_params.h
|
||||
+++ b/drivers/gpu/drm/i915/i915_params.h
|
||||
@@ -76,6 +76,7 @@ struct drm_printer;
|
||||
|
||||
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 */ \
|
||||
@@ -153,6 +132,4 @@ index 2733cb6cfe09..f21c5b1529cc 100644
|
||||
param(bool, enable_hangcheck, true, 0600) \
|
||||
param(bool, load_detect_test, false, 0600) \
|
||||
param(bool, force_reset_modeset_test, false, 0600) \
|
||||
--
|
||||
2.38.1
|
||||
|
||||
--
|
||||
|
||||
Reference in New Issue
Block a user