diff options
Diffstat (limited to 'i915-vga-arbiter.patch')
-rw-r--r-- | i915-vga-arbiter.patch | 92 |
1 files changed, 42 insertions, 50 deletions
diff --git a/i915-vga-arbiter.patch b/i915-vga-arbiter.patch index cdedd31811de..abc906b513f8 100644 --- a/i915-vga-arbiter.patch +++ b/i915-vga-arbiter.patch @@ -1,8 +1,8 @@ -From ad546a3996bf0725bb89545b4bf4656b4105221e Mon Sep 17 00:00:00 2001 +From 7209b38ae2b81e6d79aecb77263580f8840e459a Mon Sep 17 00:00:00 2001 From: Mark Weiman <mark.weiman@markzz.com> -Date: Wed, 13 Dec 2017 15:38:53 -0500 +Date: Wed, 7 Feb 2018 19:50:27 -0500 Subject: [PATCH] i915: Add module option to support VGA arbiter on HD devices - (4.14) + (4.15) This is an updated version of Alex Williamson's patch from: https://lkml.org/lkml/2014/5/9/517 @@ -34,23 +34,25 @@ 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 | 22 +++++++++++++++++++--- - drivers/gpu/drm/i915/i915_params.c | 5 +++++ + drivers/gpu/drm/i915/i915_params.c | 3 +++ drivers/gpu/drm/i915/i915_params.h | 1 + - drivers/gpu/drm/i915/intel_display.c | 34 ++++++++++++++++++++++++++++++++++ + drivers/gpu/drm/i915/intel_display.c | 33 +++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_drv.h | 1 + - 5 files changed, 60 insertions(+), 3 deletions(-) + 5 files changed, 57 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c -index 82498f8232eb..13795e7cdb5f 100644 +index 2cf10d17acfb..794590a2dcf3 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c -@@ -629,10 +629,20 @@ static int i915_load_modeset_init(struct drm_device *dev) +@@ -641,10 +641,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. -+ * ++ * + * NB. The set_decode callback here actually works on GMCH + * devices, on newer HD devices we can only disable VGA MMIO space. + * Disabling VGA I/O space requires disabling I/O in the PCI command @@ -61,7 +63,7 @@ index 82498f8232eb..13795e7cdb5f 100644 - ret = vga_client_register(pdev, dev_priv, NULL, i915_vga_set_decode); - if (ret && ret != -ENODEV) - goto out; -+ if (!i915.enable_hd_vgaarb || !HAS_PCH_SPLIT(dev_priv)) { ++ if (!i915_modparams.enable_hd_vgaarb || !HAS_PCH_SPLIT(dev_priv)) { + ret = vga_client_register(pdev, dev, NULL, + i915_vga_set_decode); + if (ret && ret != -ENODEV) @@ -70,7 +72,7 @@ index 82498f8232eb..13795e7cdb5f 100644 intel_register_dsm_handler(); -@@ -674,6 +684,12 @@ static int i915_load_modeset_init(struct drm_device *dev) +@@ -686,6 +696,12 @@ static int i915_load_modeset_init(struct drm_device *dev) if (ret) goto cleanup_gem; @@ -84,45 +86,36 @@ index 82498f8232eb..13795e7cdb5f 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 8ab003dca113..c1e5c6c2e24e 100644 +index b4faeb6aa2bd..fdf2ce69b34d 100644 --- a/drivers/gpu/drm/i915/i915_params.c +++ b/drivers/gpu/drm/i915/i915_params.c -@@ -51,6 +51,7 @@ struct i915_params i915 __read_mostly = { - .invert_brightness = 0, - .disable_display = 0, - .enable_cmd_parser = true, -+ .enable_hd_vgaarb = false, - .use_mmio_flip = 0, - .mmio_debug = 0, - .verbose_state_checks = 1, -@@ -198,6 +199,10 @@ module_param_named_unsafe(enable_cmd_parser, i915.enable_cmd_parser, bool, 0400) - MODULE_PARM_DESC(enable_cmd_parser, - "Enable command parsing (true=enabled [default], false=disabled)"); +@@ -146,6 +146,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)"); -+module_param_named(enable_hd_vgaarb, i915.enable_hd_vgaarb, bool, 0444); -+MODULE_PARM_DESC(enable_hd_vgaarb, ++i915_param_named(enable_hd_vgaarb, bool, 0444, + "Enable support for VGA arbitration on Intel HD IGD. (default: false)"); + - module_param_named_unsafe(use_mmio_flip, i915.use_mmio_flip, int, 0600); - MODULE_PARM_DESC(use_mmio_flip, - "use MMIO flips (-1=never, 0=driver discretion [default], 1=always)"); + i915_param_named(mmio_debug, int, 0600, + "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 ac844709c97e..edb6633e417d 100644 +index c7292268ed43..75577d34b0c8 100644 --- a/drivers/gpu/drm/i915/i915_params.h +++ b/drivers/gpu/drm/i915/i915_params.h -@@ -64,6 +64,7 @@ - func(bool, force_reset_modeset_test); \ - func(bool, error_capture); \ - func(bool, disable_display); \ -+ func(bool, enable_hd_vgaarb); \ - func(bool, verbose_state_checks); \ - func(bool, nuclear_pageflip); \ - func(bool, enable_dp_mst); \ +@@ -56,6 +56,7 @@ + /* 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_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 5ebdb63330dd..f686661d4ac4 100644 +index 50f8443641b8..06aebb05f23c 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c -@@ -14382,6 +14382,37 @@ static void i915_disable_vga(struct drm_i915_private *dev_priv) +@@ -14379,6 +14379,36 @@ static void i915_disable_vga(struct drm_i915_private *dev_priv) POSTING_READ(vga_reg); } @@ -131,13 +124,13 @@ index 5ebdb63330dd..f686661d4ac4 100644 + struct pci_dev *pdev = dev_priv->drm.pdev; + + /* Enable VGA memory on Intel HD */ -+ if (i915.enable_hd_vgaarb && HAS_PCH_SPLIT(dev_priv)) { ++ if (i915_modparams.enable_hd_vgaarb && HAS_PCH_SPLIT(dev_priv)) { + vga_get_uninterruptible(pdev, VGA_RSRC_LEGACY_IO); + outb(inb(VGA_MSR_READ) | VGA_MSR_MEM_EN, VGA_MSR_WRITE); + vga_set_legacy_decoding(pdev, VGA_RSRC_LEGACY_IO | -+ VGA_RSRC_LEGACY_MEM | -+ VGA_RSRC_NORMAL_IO | -+ VGA_RSRC_NORMAL_MEM); ++ VGA_RSRC_LEGACY_MEM | ++ VGA_RSRC_NORMAL_IO | ++ VGA_RSRC_NORMAL_MEM); + vga_put(pdev, VGA_RSRC_LEGACY_IO); + } +} @@ -145,9 +138,8 @@ index 5ebdb63330dd..f686661d4ac4 100644 +void i915_disable_vga_mem(struct drm_i915_private *dev_priv) +{ + struct pci_dev *pdev = dev_priv->drm.pdev; -+ + /* Disable VGA memory on Intel HD */ -+ if (i915.enable_hd_vgaarb && HAS_PCH_SPLIT(dev_priv)) { ++ if (i915_modparams.enable_hd_vgaarb && HAS_PCH_SPLIT(dev_priv)) { + vga_get_uninterruptible(pdev, VGA_RSRC_LEGACY_IO); + outb(inb(VGA_MSR_READ) & ~VGA_MSR_MEM_EN, VGA_MSR_WRITE); + vga_set_legacy_decoding(pdev, VGA_RSRC_LEGACY_IO | @@ -160,7 +152,7 @@ index 5ebdb63330dd..f686661d4ac4 100644 void intel_modeset_init_hw(struct drm_device *dev) { struct drm_i915_private *dev_priv = to_i915(dev); -@@ -14880,6 +14911,7 @@ void i915_redisable_vga_power_on(struct drm_i915_private *dev_priv) +@@ -14877,6 +14907,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); @@ -168,7 +160,7 @@ index 5ebdb63330dd..f686661d4ac4 100644 } } -@@ -15248,6 +15280,8 @@ void intel_modeset_cleanup(struct drm_device *dev) +@@ -15252,6 +15283,8 @@ void intel_modeset_cleanup(struct drm_device *dev) { struct drm_i915_private *dev_priv = to_i915(dev); @@ -178,10 +170,10 @@ index 5ebdb63330dd..f686661d4ac4 100644 WARN_ON(!llist_empty(&dev_priv->atomic_helper.free_list)); diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h -index 79fbaf78f604..c0083032a053 100644 +index 5d77f75a9f9c..982fff761e9d 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h -@@ -1316,6 +1316,7 @@ int vlv_get_cck_clock_hpll(struct drm_i915_private *dev_priv, +@@ -1340,6 +1340,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); @@ -190,5 +182,5 @@ index 79fbaf78f604..c0083032a053 100644 unsigned int intel_fb_xy_to_linear(int x, int y, const struct intel_plane_state *state, -- -2.15.1 +2.16.1 |