diff options
Diffstat (limited to '1002-i915-vga-arbiter.patch')
| -rw-r--r-- | 1002-i915-vga-arbiter.patch | 85 |
1 files changed, 46 insertions, 39 deletions
diff --git a/1002-i915-vga-arbiter.patch b/1002-i915-vga-arbiter.patch index fc546d8a9791..6307d0521302 100644 --- a/1002-i915-vga-arbiter.patch +++ b/1002-i915-vga-arbiter.patch @@ -1,23 +1,22 @@ -From 61009bd54ec93d15f9c26325cf5e5c68ac98becc Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=C3=A9clairevoyant?= - <848000+eclairevoyant@users.noreply.github.com> -Date: Tue, 14 Mar 2023 17:07:40 -0400 +From 33d2dbe323583bb2f344c857a100f1116fad70d9 Mon Sep 17 00:00:00 2001 +From: xiota <> +Date: Fri, 29-Dec-2023 12:34:56 +0000 Subject: [PATCH 2/2] i915-vga-arbiter --- - 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(-) + .../drm/i915/display/intel_display_driver.c | 16 ++++++++-- + .../drm/i915/display/intel_display_driver.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, 53 insertions(+), 3 deletions(-) -diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c -index dedbdb175f8b..e7e95308f6e6 100644 ---- a/drivers/gpu/drm/i915/display/intel_display.c -+++ b/drivers/gpu/drm/i915/display/intel_display.c -@@ -8646,9 +8646,11 @@ int intel_modeset_init_noirq(struct drm_i915_private *i915) +diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.c b/drivers/gpu/drm/i915/display/intel_display_driver.c +index 8f144d4d3..915a5ec47 100644 +--- a/drivers/gpu/drm/i915/display/intel_display_driver.c ++++ b/drivers/gpu/drm/i915/display/intel_display_driver.c +@@ -205,9 +205,11 @@ int intel_display_driver_probe_noirq(struct drm_i915_private *i915) intel_bios_init(i915); @@ -31,8 +30,8 @@ index dedbdb175f8b..e7e95308f6e6 100644 + } /* FIXME: completely on the wrong abstraction layer */ - intel_power_domains_init_hw(i915, false); -@@ -8796,6 +8798,12 @@ int intel_modeset_init(struct drm_i915_private *i915) + ret = intel_power_domains_init(i915); +@@ -366,6 +368,12 @@ int intel_display_driver_probe(struct drm_i915_private *i915) if (ret) return ret; @@ -45,7 +44,7 @@ index dedbdb175f8b..e7e95308f6e6 100644 /* Only enable hotplug handling once the fbdev is fully set up. */ intel_hpd_init(i915); intel_hpd_poll_disable(i915); -@@ -8966,6 +8974,7 @@ void intel_modeset_driver_remove(struct drm_i915_private *i915) +@@ -412,6 +420,7 @@ void intel_display_driver_remove(struct drm_i915_private *i915) if (!HAS_DISPLAY(i915)) return; @@ -53,23 +52,31 @@ index dedbdb175f8b..e7e95308f6e6 100644 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 714030136b7f..fbd500249ab1 100644 ---- a/drivers/gpu/drm/i915/display/intel_display.h -+++ b/drivers/gpu/drm/i915/display/intel_display.h -@@ -535,6 +535,7 @@ void i830_disable_pipe(struct drm_i915_private *dev_priv, enum pipe pipe); - 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); +@@ -444,6 +453,7 @@ void intel_display_driver_remove_noirq(struct drm_i915_private *i915) + intel_unregister_dsm_handler(); + + /* flush any delayed tasks or pending work */ ++ intel_vga_enable_mem(i915); + flush_workqueue(i915->unordered_wq); + + intel_hdcp_component_fini(i915); +diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.h b/drivers/gpu/drm/i915/display/intel_display_driver.h +index c276a58ee..54b752a93 100644 +--- a/drivers/gpu/drm/i915/display/intel_display_driver.h ++++ b/drivers/gpu/drm/i915/display/intel_display_driver.h +@@ -13,6 +13,7 @@ struct drm_i915_private; + struct drm_modeset_acquire_ctx; + struct pci_dev; + +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); + bool intel_display_driver_probe_defer(struct pci_dev *pdev); + void intel_display_driver_init_hw(struct drm_i915_private *i915); + void intel_display_driver_early_probe(struct drm_i915_private *i915); diff --git a/drivers/gpu/drm/i915/display/intel_vga.c b/drivers/gpu/drm/i915/display/intel_vga.c -index a69bfcac9a94..4cafe1f812f5 100644 +index 286a0bdd2..18d30ee84 100644 --- a/drivers/gpu/drm/i915/display/intel_vga.c +++ b/drivers/gpu/drm/i915/display/intel_vga.c -@@ -46,6 +46,36 @@ void intel_vga_disable(struct drm_i915_private *dev_priv) +@@ -47,6 +47,36 @@ void intel_vga_disable(struct drm_i915_private *dev_priv) intel_de_posting_read(dev_priv, vga_reg); } @@ -106,7 +113,7 @@ index a69bfcac9a94..4cafe1f812f5 100644 void intel_vga_redisable_power_on(struct drm_i915_private *dev_priv) { i915_reg_t vga_reg = intel_vga_cntrl_reg(dev_priv); -@@ -54,6 +84,7 @@ void intel_vga_redisable_power_on(struct drm_i915_private *dev_priv) +@@ -55,6 +85,7 @@ void intel_vga_redisable_power_on(struct drm_i915_private *dev_priv) drm_dbg_kms(&dev_priv->drm, "Something enabled VGA plane, disabling it\n"); intel_vga_disable(dev_priv); @@ -115,7 +122,7 @@ index a69bfcac9a94..4cafe1f812f5 100644 } diff --git a/drivers/gpu/drm/i915/display/intel_vga.h b/drivers/gpu/drm/i915/display/intel_vga.h -index ba5b55b917f0..7e2af7924e99 100644 +index ba5b55b91..7e2af7924 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); @@ -128,10 +135,10 @@ index ba5b55b917f0..7e2af7924e99 100644 + #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 +index 0a171b57f..739d31067 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, +@@ -160,6 +160,9 @@ i915_param_named_unsafe(invert_brightness, int, 0400, i915_param_named(disable_display, bool, 0400, "Disable display (default: false)"); @@ -142,10 +149,10 @@ index d1e4d528cb17..a00cbc6591b0 100644 "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 +index 68abf0ad6..507d29c52 100644 --- a/drivers/gpu/drm/i915/i915_params.h +++ b/drivers/gpu/drm/i915/i915_params.h -@@ -76,6 +76,7 @@ struct drm_printer; +@@ -79,6 +79,7 @@ struct drm_printer; param(unsigned int, lmem_size, 0, 0400) \ param(unsigned int, lmem_bar_size, 0, 0400) \ /* leave bools at the end to not create holes */ \ @@ -154,5 +161,5 @@ index 2733cb6cfe09..f21c5b1529cc 100644 param(bool, load_detect_test, false, 0600) \ param(bool, force_reset_modeset_test, false, 0600) \ -- -2.39.2 +2.43.0 |