summarylogtreecommitdiffstats
path: root/i915-vga-arbiter.patch
diff options
context:
space:
mode:
authorMark Weiman2018-12-12 11:29:25 -0500
committerMark Weiman2018-12-12 11:29:25 -0500
commiteb625e082b89f1616a3edfd7b55c1d65ac2d29e8 (patch)
treeaebeb0b1b3661029200b49467d4d9c37b6e6811d /i915-vga-arbiter.patch
parentdaa4ab363a5e07800f49d95b2208cf706c9ad8a0 (diff)
downloadaur-eb625e082b89f1616a3edfd7b55c1d65ac2d29e8.tar.gz
Update to 4.19.8.arch1-1
Diffstat (limited to 'i915-vga-arbiter.patch')
-rw-r--r--i915-vga-arbiter.patch54
1 files changed, 26 insertions, 28 deletions
diff --git a/i915-vga-arbiter.patch b/i915-vga-arbiter.patch
index cf3db06a7b6..c2e147ae060 100644
--- a/i915-vga-arbiter.patch
+++ b/i915-vga-arbiter.patch
@@ -1,8 +1,8 @@
-From d6c4ee204c18e0f15ac425928c594ec4e901d0c8 Mon Sep 17 00:00:00 2001
+From a95d3e5bab8d9d6482e81f1c3ea24c16acb2cb42 Mon Sep 17 00:00:00 2001
From: Mark Weiman <mark.weiman@markzz.com>
-Date: Sun, 24 Jun 2018 12:43:14 -0400
-Subject: [PATCH] [PATCH] i915: Add module option to support VGA arbiter on HD
- devices (4.17)
+Date: Wed, 12 Dec 2018 10:31:24 -0500
+Subject: [PATCH] i915: Add module option to support VGA arbiter on HD devices
+ (4.19)
This is an updated version of Alex Williamson's patch from:
https://lkml.org/lkml/2014/5/9/517
@@ -34,8 +34,6 @@ VGA devices.
This also rolls in reverted commit 6e1b4fda, which corrected an
ordering issue with 81b5c7bc by delaying the disabling of VGA memory
until after vgacon->fbcon handoff.
-
-Signed-off-by: Mark Weiman <mark.weiman@markzz.com>
---
drivers/gpu/drm/i915/i915_drv.c | 23 +++++++++++++++----
drivers/gpu/drm/i915/i915_params.c | 3 +++
@@ -45,10 +43,10 @@ Signed-off-by: Mark Weiman <mark.weiman@markzz.com>
5 files changed, 57 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
-index 3b4daafebdcb..1c79e6c3c54e 100644
+index f8cfd16be534..f5ba210d7b00 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
-@@ -665,11 +665,20 @@ static int i915_load_modeset_init(struct drm_device *dev)
+@@ -650,11 +650,20 @@ static int i915_load_modeset_init(struct drm_device *dev)
* If we are a secondary display controller (!PCI_DISPLAY_CLASS_VGA),
* then we do not take part in VGA arbitration and the
* vga_client_register() fails with -ENODEV.
@@ -73,7 +71,7 @@ index 3b4daafebdcb..1c79e6c3c54e 100644
intel_register_dsm_handler();
ret = vga_switcheroo_register_client(pdev, &i915_switcheroo_ops, false);
-@@ -710,6 +719,12 @@ static int i915_load_modeset_init(struct drm_device *dev)
+@@ -693,6 +702,12 @@ static int i915_load_modeset_init(struct drm_device *dev)
if (ret)
goto cleanup_gem;
@@ -87,12 +85,12 @@ index 3b4daafebdcb..1c79e6c3c54e 100644
intel_hpd_init(dev_priv);
diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c
-index 08108ce5be21..9b0f44dcfb37 100644
+index 295e981e4a39..243edeee97dd 100644
--- a/drivers/gpu/drm/i915/i915_params.c
+++ b/drivers/gpu/drm/i915/i915_params.c
-@@ -133,6 +133,9 @@ i915_param_named(disable_display, bool, 0400,
- i915_param_named_unsafe(enable_cmd_parser, bool, 0400,
- "Enable command parsing (true=enabled [default], false=disabled)");
+@@ -126,6 +126,9 @@ i915_param_named_unsafe(invert_brightness, int, 0600,
+ 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)");
@@ -101,22 +99,22 @@ index 08108ce5be21..9b0f44dcfb37 100644
"Enable the MMIO debug code for the first N failures (default: off). "
"This may negatively affect performance.");
diff --git a/drivers/gpu/drm/i915/i915_params.h b/drivers/gpu/drm/i915/i915_params.h
-index 430f5f9d0ff4..52e9081ad39d 100644
+index 6c4d4a21474b..72b9bca3cc14 100644
--- a/drivers/gpu/drm/i915/i915_params.h
+++ b/drivers/gpu/drm/i915/i915_params.h
-@@ -58,6 +58,7 @@ struct drm_printer;
+@@ -57,6 +57,7 @@ struct drm_printer;
+ param(unsigned int, inject_load_failure, 0) \
/* leave bools at the end to not create holes */ \
param(bool, alpha_support, IS_ENABLED(CONFIG_DRM_I915_ALPHA_SUPPORT)) \
- param(bool, enable_cmd_parser, true) \
-+ param(bool, enable_hd_vgaarb, false) \
++ param(bool, enable_hd_vgaarb, false) \
param(bool, enable_hangcheck, true) \
param(bool, fastboot, false) \
param(bool, prefault_disable, false) \
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
-index 56004ffbd8bb..16bc85180ec3 100644
+index 3bd44d042a1d..b1aaa966679b 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
-@@ -14506,6 +14506,36 @@ static void i915_disable_vga(struct drm_i915_private *dev_priv)
+@@ -15025,6 +15025,36 @@ static void i915_disable_vga(struct drm_i915_private *dev_priv)
POSTING_READ(vga_reg);
}
@@ -153,28 +151,28 @@ index 56004ffbd8bb..16bc85180ec3 100644
void intel_modeset_init_hw(struct drm_device *dev)
{
struct drm_i915_private *dev_priv = to_i915(dev);
-@@ -15025,6 +15055,7 @@ void i915_redisable_vga_power_on(struct drm_i915_private *dev_priv)
+@@ -15540,6 +15570,7 @@ void i915_redisable_vga_power_on(struct drm_i915_private *dev_priv)
if (!(I915_READ(vga_reg) & VGA_DISP_DISABLE)) {
DRM_DEBUG_KMS("Something enabled VGA plane, disabling it\n");
i915_disable_vga(dev_priv);
-+ i915_disable_vga_mem(dev_priv);
++ i915_disable_vga_mem(dev_priv);
}
}
-@@ -15402,6 +15433,8 @@ void intel_modeset_cleanup(struct drm_device *dev)
+@@ -15946,6 +15977,8 @@ void intel_modeset_cleanup(struct drm_device *dev)
{
struct drm_i915_private *dev_priv = to_i915(dev);
-+ i915_enable_vga_mem(dev_priv);
++ i915_enable_vga_mem(dev_priv);
+
- flush_work(&dev_priv->atomic_helper.free_work);
- WARN_ON(!llist_empty(&dev_priv->atomic_helper.free_list));
+ flush_workqueue(dev_priv->modeset_wq);
+ flush_work(&dev_priv->atomic_helper.free_work);
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
-index a80fbad9be0f..1bc005cc168b 100644
+index 8fc61e96754f..c1271e41e592 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
-@@ -1441,6 +1441,7 @@ int vlv_get_cck_clock_hpll(struct drm_i915_private *dev_priv,
+@@ -1486,6 +1486,7 @@ int vlv_get_cck_clock_hpll(struct drm_i915_private *dev_priv,
const char *name, u32 reg);
void lpt_disable_pch_transcoder(struct drm_i915_private *dev_priv);
void lpt_disable_iclkip(struct drm_i915_private *dev_priv);
@@ -183,5 +181,5 @@ index a80fbad9be0f..1bc005cc168b 100644
unsigned int intel_fb_xy_to_linear(int x, int y,
const struct intel_plane_state *state,
--
-2.17.1
+2.20.0