diff options
Diffstat (limited to 'i915-vga-arbiter.patch')
| -rw-r--r-- | i915-vga-arbiter.patch | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/i915-vga-arbiter.patch b/i915-vga-arbiter.patch index 518597d417d9..f0db0d2f0d57 100644 --- a/i915-vga-arbiter.patch +++ b/i915-vga-arbiter.patch @@ -37,10 +37,10 @@ until after vgacon->fbcon handoff. --- diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c -index 346846609f45..18be17cb56e3 100644 +index 26996e1839e2..2569e2a91e6b 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c -@@ -18753,6 +18753,7 @@ static void intel_hpd_poll_fini(struct drm_i915_private *i915) +@@ -18665,6 +18665,7 @@ static void intel_hpd_poll_fini(struct drm_i915_private *i915) /* part #1: call before irq uninstall */ void intel_modeset_driver_remove(struct drm_i915_private *i915) { @@ -49,10 +49,10 @@ index 346846609f45..18be17cb56e3 100644 flush_workqueue(i915->modeset_wq); diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h -index adb1225a3480..f39229c12938 100644 +index 3a06f72c9859..8c034bbf455a 100644 --- a/drivers/gpu/drm/i915/display/intel_display.h +++ b/drivers/gpu/drm/i915/display/intel_display.h -@@ -503,6 +503,7 @@ int vlv_get_cck_clock_hpll(struct drm_i915_private *dev_priv, +@@ -507,6 +507,7 @@ int vlv_get_cck_clock_hpll(struct drm_i915_private *dev_priv, void lpt_pch_enable(const struct intel_crtc_state *crtc_state); void lpt_disable_pch_transcoder(struct drm_i915_private *dev_priv); void lpt_disable_iclkip(struct drm_i915_private *dev_priv); @@ -104,7 +104,7 @@ index be333699c515..a76aa52cde76 100644 i915_reg_t vga_reg = intel_vga_cntrl_reg(dev_priv); @@ -49,6 +80,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"); + "Something enabled VGA plane, disabling it\n"); intel_vga_disable(dev_priv); + intel_vga_disable_mem(dev_priv); } @@ -124,25 +124,25 @@ index ba5b55b917f0..7e2af7924e99 100644 + #endif /* __INTEL_VGA_H__ */ diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c -index 81a4621853db..e2576468f040 100644 +index 34ee12f3f02d..a46477eb9e34 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c -@@ -232,9 +232,11 @@ static int i915_driver_modeset_probe_noirq(struct drm_i915_private *i915) +@@ -233,9 +233,11 @@ static int i915_driver_modeset_probe_noirq(struct drm_i915_private *i915) intel_bios_init(i915); - ret = intel_vga_register(i915); - if (ret) -- goto out; +- goto cleanup_bios; + if (!i915_modparams.enable_hd_vgaarb || !HAS_PCH_SPLIT(i915)) { + ret = intel_vga_register(i915); + if (ret) -+ goto out; ++ goto cleanup_bios; + } intel_power_domains_init_hw(i915, false); -@@ -276,6 +278,12 @@ static int i915_driver_modeset_probe(struct drm_i915_private *i915) +@@ -280,6 +282,12 @@ static int i915_driver_modeset_probe(struct drm_i915_private *i915) if (ret) goto cleanup_gem; @@ -156,7 +156,7 @@ index 81a4621853db..e2576468f040 100644 intel_hpd_init(i915); diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c -index add00ec1f787..e4f49c63a397 100644 +index 02559da61e6e..da4f8fe3b2a6 100644 --- a/drivers/gpu/drm/i915/i915_params.c +++ b/drivers/gpu/drm/i915/i915_params.c @@ -121,6 +121,9 @@ i915_param_named_unsafe(invert_brightness, int, 0600, @@ -170,7 +170,7 @@ index add00ec1f787..e4f49c63a397 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 45323732f099..304987c4f9e8 100644 +index 4f21bfffbf0e..3f3bfb5eff5d 100644 --- a/drivers/gpu/drm/i915/i915_params.h +++ b/drivers/gpu/drm/i915/i915_params.h @@ -70,6 +70,7 @@ struct drm_printer; @@ -181,6 +181,3 @@ index 45323732f099..304987c4f9e8 100644 param(bool, enable_hangcheck, true, 0600) \ param(bool, load_detect_test, false, 0600) \ param(bool, force_reset_modeset_test, false, 0600) \ - --- -5.5.5 |